Snap for 5698743 from b64f24986ec886046d56f933d59ffde26976d6b5 to qt-aml-release

Change-Id: I23ea44f5daba9fc4fb529ee048f2e3011c9be97d