Snap for 6300905 from e861749b6537943ed0197dc712f8a8722baf0cac to qt-d4-release

Change-Id: I05b61041f5758a285624a9399276cff0a17ec14d