Snap for 5304721 from 170fe588d8b632ce95041ff010a06c2229bb1be3 to qt-release

Change-Id: I8cbbaff014d60cb329fb4116eaa358105025d726