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