Backport r81155.
2 files changed