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