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