Snap for 5671254 from d1defa1bdfb039bb8faee5e1600fcea3b92cba5f to qt-release

Change-Id: I0afcafd1b95491196e19f0472e054875fa0bf72d