Snap for 5335706 from 9a2d58984f50f38e1ead179aec043e96dea15115 to qt-release

Change-Id: Iaca04c3946d30d9896b76ccd8a9c00602293dd81