aml_med_331012020
Snap for 8562061 from d6854b78cd0ed8288f8d81970eff353d2176be24 to mainline-media-release

Change-Id: I83785404e744617be82d963703a59e440ca456c2