Merge "Revise OWNERS"