Snap for 5645017 from 7f20188e8738c2bdc66780c7420a574e65ae106d to qt-release

Change-Id: I40a2409a5a92d0d0ec5216551ab1cc25fde8811e