Snap for 4896767 from 9f57db4659c041eb4e7e8b9d30a6b8bde0b5e9b0 to qt-release

Change-Id: I948f523c3fe47c6d9e6b819acb334f862dca2501