Snap for 5704971 from 8a9f7bbf46335129f195ddca33c0e2e72d46684c to qt-release

Change-Id: I318267ce9b613af76e5165b2479f255e943590d1