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