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