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