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