am a5aa4b48: Merge "Address the API review" into lmp-preview-dev

* commit 'a5aa4b4879761a93c936303cf5c34d499aa0fe76':
  Address the API review