Merge "3/n: Add most remaining plumbing for authenticatorId invalidation"