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