Merge "Update AccountManager's javadoc."