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