Snap for 5301221 from 6c22ed950e297189bee56339b3c0e2cbb9b0ae43 to qt-release

Change-Id: I88430531c27c97937ea1fad0032f3c9df72cec61