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