Snap for 4796633 from 3a190969e3acc064be0d5c15e0cb5db969c07d2c to qt-release

Change-Id: Ic478852c2996111602246735ae4a49d917b985ac