Automatic merge from submit-queue Rewrite disruption e2e test to use versioned client. This currently includes the changes from #31638. I will rebase once that is merged.
Automatic merge from submit-queue Rewrite disruption e2e test to use versioned client. This currently includes the changes from #31638. I will rebase once that is merged.