Snap for 5663823 from 5a70badd1de4e4e4e8aefaac7fae8fafadf28066 to qt-aml-release

Change-Id: I66110f50577705c02fc1ffd014641c17e63287dc