aml_med_331712010
Snap for 8562061 from 7771b626ec751b7c219f74b4298f4efc5557dbb4 to mainline-media-release

Change-Id: I600979a253adba42af489fc695fc4e3139c34252