Snap for 5364434 from 69a963f555f88f0fc886cdb6eb63e51d4e440acf to qt-release

Change-Id: Iabe9d6f0981fb2236cead5417ff56c30b61094dc