Snap for 5335706 from ed5cd82fc8cb4f98aafeeaad550860132c27234a to qt-release

Change-Id: Ibc4d568aa7d0b06fc46c4be993875ed02d6a352b