Snap for 5645017 from 069416d1f38144fd603c71524d3a76b4eab320f5 to qt-aml-release

Change-Id: I0e1c9dc82b733cd57ac72ae52d76581414fe705e