Merge "CL to support method signature change." into jb-ub-mail-ur9