am d0f6f903: Merge "Tidy MethodProtoHelper."

* commit 'd0f6f9037a19d2f78d885a6e758b98651317b0d9':
  Tidy MethodProtoHelper.