Change-Id: Ib93a66f56ecd7a1324195e817f14280fcc0c3625 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>