Snap for 5645017 from 2a9f8b378b1d69e91abc1705e8a3d16bb3a04d93 to qt-release

Change-Id: I6263b89337cab573f03c4c4de18f5ee95db0fb56