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