Snap for 6268612 from a6544e3bf7de17f104d5fb509d6cb7f6d90dc79f to qt-d4-release

Change-Id: I01545234559cf2b73de106e021767fd2d0a3a065