am 601d017c: am efe6c903: am cffbcb8a: Merge "Address API review comments" into lmp-dev

* commit '601d017c2209f0a7930503a0bc97b4e762e4e8a1':
  Address API review comments