Merge "Remove hardcode class path for CredentialStorage."