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