Merge "API changes for AuthManager"