Merge pull request #1190 from google/const-return

Merge pull request #1190 from google/const-return #1157