aml_go_ext_330912000
Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ifb2e8e86864c02ede9f4fbb3517d0ed249ea5f6d