Merge "Remove ex-team members from OWNERS" into main