Snap for 5674548 from bb150e9962d7dbcab33dcc83da6f95ae72d0f1d1 to qt-aml-release

Change-Id: Iac5a6f522c98d5f326317cd2f45fdbd95f077df1