Merge "Update OWNERS for internal Chooser and Resolver"