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