Merge "Fix credentials_factory method call"