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