Snap for 5333170 from e9850af1278e499e427d08dbf40244f3622bd6db to qt-release

Change-Id: I8a48789007edf830db183310454f2285d6a6ecf9