Snap for 5096429 from 5633b980452b9da080d40451ee0c6202b4c8fa7a to qt-release

Change-Id: Ifce4c60ff837629969c49ff79fe8ef77ce95f80b