aml_med_331012020
Snap for 8618784 from 005ce65d018aaa43641580e1316a09f255d9118f to mainline-media-release

Change-Id: If9859dcc50f567ab7eed1e2bb46b88ed126fb31b