aml_med_331012020
Snap for 8657776 from 59e0307c112d41398f327727feb7d4dd260f39e2 to mainline-media-release

Change-Id: I617e55b698f0ce8015dce7d5ef34277e94edf89c