[cherry-pick] #24345 to earlgrey_1.0.0
branch
#24834
Merged
Loading
earlgrey_1.0.0
branch
#24834