Sync with various Google-internal changes.

Should not mean much for the open-source version.
3 files changed