Snap for 6294593 from f9a4cac985ebc5ba8785ecf2cc0512f167b6ae98 to qt-d4-release

Change-Id: I74782c2029d6b4637dc7296d5acada9f5a0ed5f4