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