Snap for 5333170 from 32d5199d69463d2bec5d744ce76e38d756d8edeb to qt-release

Change-Id: Ic8aec6e046c95afbefdcaefb585710f8fb1c9447