Snap for 5803298 from 7a2b4a3fe876ac8dafc3a163c7e11cfe7645ea16 to qt-aml-release

Change-Id: I0bec714206cae69f4726d5067022c1967968f2bf