Snap for 5605988 from 7e80e05030056317d3d9b61ae5692b43c2c1772d to qt-release

Change-Id: I61bcfbcfb63b729a688d602edd9d56c5f4d1bef0