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

* commit 'cc1ba123327cf6bff23d856f5f1b9c16b8749986':
  Implement API review feedback.