Automatic merge from submit-queue etcd: fix rollback fix #36555 tested manually. worked. /cc @mml @wojtek-t
gcloud docker
gcloud docker -- ARGS