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