Snap for 5582669 from bfe7fe1e90011700833497ac0afbe9e4df50dbe8 to qt-aml-release

Change-Id: I4a3aad29c117d77a86afdd14058cdd4e8a26db49