Backport of r64677.
2 files changed