Merge "Consolidate input OWNERS files"