Snap for 5582669 from 4e5433c26913d2e85e7d14e8dc585a3a14646648 to qt-aml-release

Change-Id: I47ac99b97c13f60430bd7d528cb279299dceb341