Snap for 5698743 from ab9e462966dfb738d9b4f00ed73ecbb8ad6c2df5 to qt-release

Change-Id: Icb51f0d92e54a3b41893d61efeb7253ccfe5000a