Snap for 5217728 from af72efdeea07f9a5a38676e39a66ccee2ab51cad to qt-release

Change-Id: I29fc0cfa31795fcb71ce646f234ad9e1dd4f53ac