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