Snap for 5214914 from f4a9b2b86d0b6196618a4fc8a8a04f36898a8087 to qt-release

Change-Id: I1831170ed35535277384ec0231dbd37c0b59ad9b