Snap for 4954221 from 32c6f47b697aa62c42f4126bb6df8e894546f568 to qt-release

Change-Id: I70d1c09084dee2abcf2b31a2a0a3e3ffbf245d43