Merge "Consolidate OWNERS files"