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

Change-Id: Ia449fb559161271c71036b64ce145725267b9bb6