Snap for 4733905 from 0d4ef610f469ff42f42dba9fd535aaa8d8fd276b to qt-release

Change-Id: Id16a5b61abd465f6791721b5ae54afc952c72ed9