Snap for 5228332 from f58d820b532b61f31c0989399f9157a03bf0bf9a to qt-release

Change-Id: I550588a6f81ca9caa2778531ebd1cec28142d7b8