Snap for 5702388 from 4f398669a4731846c40bd028c06e4c6ba5d2bfb6 to qt-aml-release

Change-Id: I652bd94a2c7cef62694d8fc56d2e17722b6aba22