aml_med_331012020
Snap for 8769705 from 11e65c50836afcb44b2ba31dfc6261d7e19a3a87 to mainline-media-release

Change-Id: I4a137de5c8a02a0a02ae41c17d42076a0055549c