Manual cherrypick required. #26224 failed to apply on top of branch "release-1.6": ```exit status 128 ```