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