Bug: 358041425 Test: verify pass Change-Id: I26703b29e53e033d6bc978a4e6ac667953d2f282
Bug: 258364350 Test: Verification at b/258364350. Test: Function verification at b/258364350. Test: Compile and verify the configuration is correct. Change-Id: I4dfdc8d65a3a407db3b66aae1a5f05fc0cd226c5