Down-integrate from internal branch.