Snap for 5082210 from f73a77750a8d1ae59d5116b7d87d8f4f756266d2 to qt-release

Change-Id: Ibe3a51e9ba6c09052c3080ab5cfebc4e6abf45e3