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