Snap for 5248711 from 81f53e4aca023a8ac87df973606507b8d163bbc3 to qt-release

Change-Id: I87d1b6b68b984c7fd938a8f8f3534cdf76cb01d9