Merge commit '44dd4732184ce01b5fa0c7ed09347d27de60595b' * commit '44dd4732184ce01b5fa0c7ed09347d27de60595b': update account manager javadoc
Merge commit '44dd4732184ce01b5fa0c7ed09347d27de60595b' * commit '44dd4732184ce01b5fa0c7ed09347d27de60595b': update account manager javadoc