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