Automatic merge from submit-queue (batch tested with PRs 45996, 46121, 45707, 46011, 45564) Fix waitForNPods in restart.go From https://github.com/kubernetes/kubernetes/issues/45991#issuecomment-302292404. Don't redefine `pods` so we can return real pod names instead of empty array. /assign @dchen1107 @bowei **Release note**: ```release-note NONE ```