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