Snap for 4919674 from 4351e494656f9d4efca370dce4fde39b4699eefe to qt-release

Change-Id: If4892a616997acde66909b089707bfabab12e4b3