Merge "Follow API change for method name" into lmp-dev