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