Snap for 5087535 from 2da8a044f4f37b5b9a92d0b01244a6893910b627 to qt-release

Change-Id: I4d7bbc16f5145da804b0fe666b7c628bbbbdd5e2