aml_med_331012020
Snap for 8562061 from 8f1564262a5d3b1638d877319ad5aa3e88e02724 to mainline-media-release

Change-Id: I88b52bff5b419bdb3b700a7b55617581e4d48142