Snap for 5138341 from 4116c9fbd539423ce6226310384e6cd0c7a3f72f to qt-release

Change-Id: I5ab634ccfbfb96f5a697837a49e3193185063998