Snap for 5342135 from e1e9cad4d0c7c9825b7f29ebc082dfcbdcace25c to qt-release

Change-Id: I7af1f9ce560ccd0b8e3bea7af33419731f0b0e64