Merge pull request #1467 from pherl/master

Merge Google internal changes