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