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