I'd like to backport #81972 to the release/18.x branch. /cherry-pick a5865c3c3dbbd17ae12ecc1c297fe1fc2605df52