am 3eeac344: Merge "Implement API review feedback." into lmp-dev

* commit '3eeac344b1aedf116b2340f3028f2cbaf34945d1':
  Implement API review feedback.