Merge "Trim OWNERS"