Automatic merge from submit-queue Re-enabled HPA upgrade e2e test Re-enabled HPA upgrade e2e test. ```release-note NONE ```