Snap for 5304721 from 88e1ac5abecc83543008fb5bf14fcb057b21ed8f to qt-release

Change-Id: Icc07a934e184445c4e4c7d8c13d1944208aabdd7