Backport of CC-6137 to release 1.17.x #19361
Closed
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Manual backport of changes made in #19252 to
release/1.17.x
The original backport looks to have gotten caught up in the backport backlog when they were disabled during the cutting of the ga branch and subsequently removed from the merged code in this PR: #19350
Manually backporting it into the
release/1.17.x
branchTesting & Reproduction steps
Links
Original PR
Failed backport
PR Checklist