Merge "More OWNERS refactoring"