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

Change-Id: I36ae63ccfe8032752ed97d7e38fd214604195f10