Snap for 4942340 from bff98c47ddae64dba6deabccd158d3fdd0642311 to qt-release

Change-Id: Iaf5520d77740e498b5e08a81b57ab09071d6f9a4