Merge "Remove creds providers dependency from clients"