Merge "Remove usage of credentials_factory.AdminManager"