Snap for 5645017 from e2faf9c0d8db8c6af1dbafd95447d1c8e8cef085 to qt-release

Change-Id: Id471f7d6f9baaacf96d57b39e834cf5cd6457342