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