e8199c4 Revamp credential related utilities as CredentialServiceProvider.