Snap for 4856842 from 8c3a35f9f8a458f5b23c6ec1d1b11b8e543fff04 to qt-release

Change-Id: Ia96da1888c5161b30ddab524a47bb0a9251e2c7f