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

* commit '064b5a295cb3964b65cea1ac905f9a268dece5b7':
  Implement API review feedback.