Snap for 5645017 from 5ad4d88c206a848db08050e9129c9ed33d6844bf to qt-release

Change-Id: Iaff3405935c340bd4e79887f6beedfad4ecbb203