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