Backport of r74103.
2 files changed