Snap for 5511022 from 9d1de5e3e9ef76de2b532796f7a551891aeba94d to qt-release

Change-Id: I91b2ebc1433c3020bcce5813f9db57fc3b34e970