Snap for 5321987 from 05677f7f44a753b756709ddbd7eebdffa34f62f4 to qt-release

Change-Id: Ic3adc18416677f5a2e7fce4f749db6c2f8163a57