Snap for 5476769 from aca2bc0992045338dcc5acb21776a387431a270b to qt-release

Change-Id: Ie800db523faf66986a412aa7fa4c9a8374e3f036