Snap for 5335706 from 52bff87fa8f9413d81d8af0d258fa4ea209f84ec to qt-release

Change-Id: Iba1a8831b9e1a059e5c48b9ae9b75fa866aa0448