Merge "Add entry to OWNERS"