@dmitshur requested issue #67698 to be considered for backport to the next 1.21 minor release.
@gopherbot Please consider this for backport, in particular CL 589295 CL 589495 and CL 589296. They apply test-only fixes that are needed to fix builder failures in newly running tests after a builder change.