Snap for 5174203 from 3a54736d56ffb3439760e0e88db8f4ee387afb6b to qt-release

Change-Id: I6ce3a587206998099bb19558ed6414b27044af80