Merge pull request #1377 from google/rev-0.27

Merge pull request #1377 from google/rev-0.27 #1002