Snap for 6268612 from a98c32e54b9b4bd234c2126f3d89e38637accb7d to qt-d4-release

Change-Id: I717a883fc7021aee1876189f7aaec639af8d01c0