Automatic merge from submit-queue (batch tested with PRs 35782, 35831, 39279, 40853, 40867) remove unnecessarily duplication since types collapsed We collapsed duplicate types into client-go, so we get to clean this up. @sttts as promised.