Merge pull request #1199 from google/google_integrate

Integrate google internal changes to master