Snap for 5617038 from c12dd96f7694e098fbd2fd4e1d0f15869f349d49 to qt-aml-release

Change-Id: I86bf086d2e2225e1f9971e4129cecc15b30ef2ae