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