Merge "Consolidate OWNERS for input"