Snap for 5333170 from 86f27246919d505829a3ccb4f021fe05d182edc1 to qt-release

Change-Id: I40e30b43c349db8c34cd61e58676dceb659bc2f0