Merge "Relax security constraint around getAuthenticatorId()." into nyc-dev