Snap for 4821358 from 31b994e8e93e04e29f59ac98e845b42750668178 to qt-release

Change-Id: Ie0662dfc98ab8385607b1a94a556b21ba9e16d90