Snap for 5115169 from 9e42d2db32040e05a1ff9fdba1f1b5c41c340a13 to qt-release

Change-Id: If068d5ec8d3120512bd1f750e74f71e7b45e93ae