Snap for 6224676 from e9080f3f999eeb872ff73aa0f8d39a48f07c7e11 to qt-d4-release

Change-Id: Idee0c2a32e4d15f5fce0fd228eff823c0389366a