Snap for 5645951 from 606cfa4a45a45dd4de1d85988bf93159e48c8e75 to qt-release

Change-Id: Ife3115891e56e84aa4f997490890abb87ef81e95