Merge commit 'db8fdbec4268697653d5688d0a0092483b3832f1' * commit 'db8fdbec4268697653d5688d0a0092483b3832f1': account manager api review changes
Merge commit 'db8fdbec4268697653d5688d0a0092483b3832f1' * commit 'db8fdbec4268697653d5688d0a0092483b3832f1': account manager api review changes