Snap for 5511022 from ff9ac9e2869b105de3a972d5cff1becc9443fcde to qt-release

Change-Id: I0b8f29c549109b1b4bd26fd46368337643a11dd0