Change-Id: Ie549f9843db985018af380eb6105e136f21989f7 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>