Snap for 5803298 from ecf167812fc2d94aaee73d3128b003e75ff61131 to qt-aml-release

Change-Id: I7dd461df7cb6f52be0d6cc0bbbf6119377937e8f