Automatic merge from submit-queue simplify svc lister trying to track down what killed the e2e tests.
