Merge "Avoid 'message' in log context in AuthManager"