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

Change-Id: I219139fde5c35adb09bd1a3f012e97a3a8dc4313