Snap for 5637134 from 0dff785221afbd51b92d46ba276018d0c977bc17 to qt-release

Change-Id: Iecef8dfd099d7418df636c1a870c01b717f93230