Merge "Revert "API review changes Test: make Bug: b/143307441"" into rvc-dev