Snap for 4829746 from 347ce8190c6c6aa8b8304580172b796d6a6df5dd to qt-release

Change-Id: I261f86b3ac53f0ce7011ad7bc2a16fc06edea8db