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