Sync with internal Google development.

This breaks the open-source build, will
follow up with a change to fix it.
31 files changed