Down-integrate pending changes from internal repository after previous release.
11 files changed