Merge \"Relax security constraint around getAuthenticatorId().\" into nyc-dev
am: 60c04126c9

Change-Id: I367432f84032da91ea5b9a39e8f4cf6a8eb6ea81