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