Snap for 5582669 from e8eff3e5c6cd60a6b64837e57b6127ae800f8b31 to qt-aml-release

Change-Id: I9394842d39695fee5f79bcd84cf356df57d9b3ce