Snap for 5228332 from ce7b14dffb44e92cf76368f378186ce7f9cd59fe to qt-release

Change-Id: I23291d0f36cc3479d3cc6a107afca4bc7f05280f