Merge "Move default creds to cred_provider"