Snap for 4869171 from a9ffde406a08340739d07fa083080ff17c7d04f4 to qt-release

Change-Id: Ic067220a857f624b1bf84b4669a6199227fa7d12