Snap for 5434517 from 36dcc7f53e9d920bab535d0dba17f76159a0e3b9 to qt-release

Change-Id: I086ac1ffe505219ddf014985aed5b2dac63b616f