Snap for 5480912 from f4de813fcfd374feea376d52f3d224e86b8e6c20 to qt-release

Change-Id: I6cac8a2509b22c8a2b92dea35b0642365d025d11