Merge "Update the OWNER files" into rvc-dev