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