Merge "4/n: Add RevokeChallenge and ResetLockout for IFingerprint"