Snap for 5333170 from e3ff6769f8262841c98245e21b96dc67536759dc to qt-release

Change-Id: I6cd15bed8e791bc740c12be081f3d429c8b630c5