Fixed to match Credential API refactoring.
Merge branch 'v.next' into dom/api_credential_refactoring
Merge branch 'v.next' into dom/api_credential_refactoring