Merge "3/n: Move generateChallenge/resetLockout/revokeChallenge off critical path"