Merge cherrypicks of [9434364, 9434203, 9434365, 9433586, 9434204, 9434205, 9433656, 9434206] into sparse-5888992-L32000000368541170

Change-Id: I1f0b6692223c56b2d4cd0ba8cf7f9a131ca99b5e
diff --git a/1.1/hal_st21nfc.cc b/1.1/hal_st21nfc.cc
index 59823e6..7c5c8c8 100644
--- a/1.1/hal_st21nfc.cc
+++ b/1.1/hal_st21nfc.cc
@@ -408,7 +408,7 @@
 
 void StNfc_hal_factoryReset() {
   STLOG_HAL_D("HAL st21nfc: %s", __func__);
-  hal_wrapper_factoryReset();
+  //hal_wrapper_factoryReset();
   // Nothing needed for factory reset in st21nfc case.
 }
 
diff --git a/1.2/hal_st21nfc.cc b/1.2/hal_st21nfc.cc
index c7e8d16..643c545 100644
--- a/1.2/hal_st21nfc.cc
+++ b/1.2/hal_st21nfc.cc
@@ -409,7 +409,7 @@
 
 void StNfc_hal_factoryReset() {
   STLOG_HAL_D("HAL st21nfc: %s", __func__);
-  hal_wrapper_factoryReset();
+  //hal_wrapper_factoryReset();
   // Nothing needed for factory reset in st21nfc case.
 }