Automatic merge from submit-queue Address remaining TODOs in kube-proxy. Followup PR from the previous two.