Snap for 5803298 from 8bf79f7a6c770ca1989da6cb3ed544dba03a4d12 to qt-aml-release

Change-Id: Id2432219e9ac04e135bfe52bdfb694a70aa04bbc