Snap for 5582669 from a56b2293697895480e91b7447e6f44c1da2e9c9d to qt-aml-release

Change-Id: Id2bb3a9d92b6577fc951ba564095b269c384ea02