aml_med_331012020
Snap for 8562061 from 0197c63f219a8ba4e1534c01b3b06ab31cdd1dcf to mainline-media-release

Change-Id: I6aa6eefb37abe5e2505bb675aa63ac2d0cc3d531