Snap for 5645017 from 648f8a4d0805bc91bb2da214622601bdd44cd16b to qt-release

Change-Id: Ia6ed3196eefb6524bbc1818cf5fb0414ea5746a9