Snap for 5333170 from f1cb53780e02e7a9112b4aa53a132cae53a1fa15 to qt-release

Change-Id: Ibe8ecccb9d0335950e7bd48b2e8b72b41f9beec5