Snap for 5803298 from ad9f6b17a37668fc80e525051ca9cc57d56d681a to qt-aml-release

Change-Id: I8fab4df5093a4222ce3d4b9a6aa9e6b9843076ea