Merge "API review comments Test: make Bug: b/150126235" into rvc-dev