Snap for 5204403 from 30ba96db3022bebabba9fe49157640afbd38ffd6 to qt-release

Change-Id: I7cbcd46a7d1e8bef6c29569d9c2624272b8d0e22