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

Change-Id: Id54316e916f42d4fd8c9c78f286c8178f713ab26