am bde29af9: account manager api review changes

Merge commit 'bde29af962d7e3d073dc9bcae4ee2e9609a2eeb3'

* commit 'bde29af962d7e3d073dc9bcae4ee2e9609a2eeb3':
  account manager api review changes