am a6b79eb9: Merge "Prevent conflicts between local and proto variable names."

* commit 'a6b79eb9618fc1774aa18a0b365e48398f23808a':
  Prevent conflicts between local and proto variable names.