Snap for 5582428 from 16622e121da244eebf57ba61905cd6d42d02e79b to qt-release

Change-Id: Ib4bf1acd655f6302ef64c4d856f915c40db45f90