Merge "Update CreateCredentialRequest and GetCredentialOption with recent changes."