Snap for 5612763 from ca4a35de8bb9197ea5079c4f756ada00e157a480 to qt-aml-release

Change-Id: If5547cd71f41a9921241ae1f2b5b4df376355ebc