Snap for 5304721 from 96a0f6e570f7917a7d2eb9e3d83923b6ac8b004d to qt-release

Change-Id: I59e047e1d7d6e89ba419f8e9391ea91ac94f4493