Change-Id: I563b93beb836dad43146319f97fb48192a139511 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>