Merge "DO NOT MERGE Fix broken test" into rvc-dev-plus-aosp