Backport r59688.
2 files changed