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

* commit 'c3ae3aea8f1f99e05c711a712f371b5bb5b919ff':
  Implement API review feedback.