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