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