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