Snap for 5096429 from c1f44a67537740cf31ccc3cfefb3a82c5c573ad9 to qt-release

Change-Id: Idba6ae9ef2fbfa5165cd3b0927192a8d950a678a