Snap for 4942340 from 10b8f29e2a656ca847fd64229d1d691e1a5a96fc to qt-release

Change-Id: I0fe644684a37154a1ea353dfdfb774acacd0e8f3