am b7dd9519: Merge "API Review: Clean up removed APIs" into lmp-dev

* commit 'b7dd9519c9e3566a7c857c5caf92a8a2a1a48401':
  API Review: Clean up removed APIs