Snap for 4821358 from b609f198b1c1d9deafd2a1c8279e7faa5e92c095 to qt-release

Change-Id: Iaff1bf1c0306be85c1cafad0cc6ca3c9debc2077