am 310da35c: Merge "Follow up API signature change" into lmp-dev

* commit '310da35c77779f399e12c1e4365e6372d1477ef3':
  Follow up API signature change