am 8ec72b76: am d0f6f903: Merge "Tidy MethodProtoHelper."

* commit '8ec72b76f64baafcdb78d134909f9acd3e73f4af':
  Tidy MethodProtoHelper.