Change-Id: Ic1259f04f4120b6e495ebb3672f7f360c71cba7f Reviewed-by: Eike Ziller <eike.ziller@digia.com>