Snap for 5045582 from 7a9664fe4ef0f1f94d5275d22cb5f6984d5abe56 to qt-release

Change-Id: I73a621b2668a58b2b2cf56cca47f33a37d14d4ce