Snap for 5096429 from 5db59038255d19bd09b750e9898c07f17c5a5221 to qt-release

Change-Id: Id0b3f53ead5a5f2476961f93de183178e7f7ad17