misc changes
changes
Merge pull request #1 from google/foo-branch

Foo branch