Snap for 5706892 from c4cd8ed446dbde39df701dab0525e5ef5b9824ec to qt-aml-release

Change-Id: Ie88913037217c8f57e211b0a51986bcb6fc9e9dd