Merge pull request #920 from google/merge-internal-changes

Merge internal changes.