Snap for 5596078 from 0b7af50e30960f67ace45d1c2efbe7e6903c2f0f to qt-aml-release

Change-Id: I076e1148a16ac6a15249e89ca65ae636e05bc31d