Merge "Use singular OWNERS file." into main