Snap for 5663823 from 5dfae2112fec6683b37cd1fe9ec1b69468732527 to qt-aml-release

Change-Id: I991b084d726dd13f0cce484ec0c7fc77e9e2ab7a