Snap for 5803298 from 0f3bf10aba2a76e026d11165f072ad998a7feaa0 to qt-aml-release

Change-Id: If1709e153db93a4c6b4eecf7a9b07bb4064b5798