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