Merge "Remove HAT from invalidateAuthenticatorId and correct documentation"