Backport fix from 51683.
2 files changed