Snap for 5663820 from e99a9cd8ca44ee915ad6d131606006c782ecb7f2 to qt-release

Change-Id: I081071fab85337ae38934fd30c2eb6c6248adb78