Snap for 5082210 from c7e5eae18e3459b9853560cd9c398d2e735e317f to qt-release

Change-Id: I87cbc94db1c63f4d4f461e49a5ecd2827aa643e9