Merge "Revert "DO NOT MERGE resolve merge conflicts of 3604fffb to rvc-dev-plus-aosp"" into rvc-dev-plus-aosp