Merge "Specify UID in getAuthenticatorIds"