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