Snap for 5778854 from 363e8dad5d1109d1e88f35d23e627ea7cce521b5 to qt-c2f2-release

Change-Id: I8d94849591623800457fe3838aedfb4193d56ab8
diff --git a/src/faceauth_tests.cc b/src/faceauth_tests.cc
index 41aefcc..14a01cb 100644
--- a/src/faceauth_tests.cc
+++ b/src/faceauth_tests.cc
@@ -463,12 +463,6 @@
                  .Run()
                  .GetResult(),
              Result(FACEAUTH_ERR_INVALID_CHALLENGE));
-  EXPECT_REQ(Transaction(Task(PROFILE_1, FACEAUTH_CMD_RESET_LOCKOUT),
-                         Embedding(EMBEDDING_VECTOR_1, 1), Token())
-                 .Finalize()
-                 .Run()
-                 .GetResult(),
-             Result(FACEAUTH_ERR_INVALID_CHALLENGE));
 }
 
 TEST_F(FaceAuthTest, InvalidChallengeShouldError) {
@@ -494,12 +488,6 @@
                  .Run()
                  .GetResult(),
              Result(FACEAUTH_ERR_INVALID_CHALLENGE));
-  EXPECT_REQ(Transaction(Task(PROFILE_1, FACEAUTH_CMD_RESET_LOCKOUT),
-                         Embedding(EMBEDDING_VECTOR_1, 1), Token(rand(), 0, 0))
-                 .Finalize()
-                 .Run()
-                 .GetResult(),
-             Result(FACEAUTH_ERR_INVALID_CHALLENGE));
 }
 
 TEST_F(FaceAuthTest, EmbeddingCRCErrorShouldBeDetected) {
@@ -835,11 +823,6 @@
   Result enroll_result = user1.Enroll(PROFILE_1);
   EXPECT_REQ(enroll_result,
              Result(FACEAUTH_SUCCESS).SetChallenge(user1.GetAuthID()));
-
-  /* Reset Lockout User ID Check */
-  EXPECT_REQ(user1.ResetLockout(PROFILE_1), Result(FACEAUTH_SUCCESS));
-  EXPECT_REQ(user2.ResetLockout(PROFILE_1),
-             Result(FACEAUTH_ERR_INVALID_USER_ID));
   /* Set Feature User ID Check */
   EXPECT_REQ(user1.SetFeature(PROFILE_1, 0), Result(FACEAUTH_SUCCESS));
   EXPECT_REQ(user2.SetFeature(PROFILE_1, 0),