Merge "API: Fixes for AuthManager"