Snap for 6300905 from 701ff2ece9b209472a17998f0acefe3f067194fa to qt-d4-release

Change-Id: I9ffd229c96e12da46880bfe47cbdf9afe6ac72ad