Snap for 5335706 from 9f9437d9315215e56e50bb553890126f9970a5f7 to qt-release

Change-Id: Ifd5ff43f2518cca4a61bc148f84b1f8cd25461fe