Snap for 5096429 from e9245d1721c8d6066523f459a9fbc84da821e6ca to qt-release

Change-Id: I710e4e03aa29c2b28ce7b35a8f2c06e8f081fea5