Down-integrate from internal branch
4 files changed