Snap for 5480912 from d0052c30cef1202fff6bb0f87d64eddb98cfbc99 to qt-release

Change-Id: I12e6fa7fa3f9d6593c8238173d68b3e6d7257f96