Snap for 5228332 from f2b3b1f9df60232a8f4944f11a4f51739320bdcd to qt-release

Change-Id: Ib4c660c3b8257109266846b0a94e77a0617fc9b6