Merge "Actually make OWNERS in sync with the internal version"