Snap for 5228332 from c845b335716078e7b9986f0dcf52078d391a25ab to qt-release

Change-Id: I273884dd0b9704455eab8bc33ddbd06beb39f9f7