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

* commit 'a17a24366b08bc6af01953f1385ade2394066e45':
  CL to support method signature change.