Merge "Identity Credential: Apply changes identified in API review."