Merge "Update getAuthenticatorId logic" into sc-dev