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

Change-Id: I7bbc03062366146ad9287aec253d729768eac708