Snap for 5304721 from 4f7c5560f217af15489af0df2e7f634a9fa6890c to qt-release

Change-Id: If5b884dc8020414cdafa64581b62a2d4906de030