Snap for 5511022 from eb729938af24925178e3d181a42b727bfcea66fd to qt-release

Change-Id: I3d8416cf381a987c542bca9c3a83dbb4bff58cae