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