backport r73268
2 files changed