Snap for 6102647 from a7130e9e137a1a3f3e3a456138870d547bcbe10d to qt-d4-release

Change-Id: I0908174a62db8899c8f58733519110e376216996