Snap for 5333170 from 4a8974da598bde9881f85699fefd69ec776be5b4 to qt-release

Change-Id: I54c0a5b12c1596ea6e6214b61f1e9b929fb5bd54