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