am 7ed75feb: Merge "CL to support method signature change." into jb-ub-mail-ur9

* commit '7ed75feb1492ac3350ba00527a11d26a239e4511':
  CL to support method signature change.