Merge "Remove inactive owners from OWNERS and add active owners."