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