aml_med_331712010
Snap for 8562061 from 3014a156b84a468e606d45479c584e622b4f1009 to mainline-media-release

Change-Id: Iaa7575bbdb8041f738920625408659f973042fdc