Merge sc-qpr1 to aosp-master - DO NOT MERGE

Merged-In: I105e05b7eb9545053dec059742b38f7e676ddfed
Merged-In: Id95d5ed172672f205b55acd68acebfbd3087551e
Change-Id: Iff5cbe84b1e7caf74b7b5500da3b3c190fc577ee
diff --git a/pn8x/halimpl/tml/phTmlNfc.cc b/pn8x/halimpl/tml/phTmlNfc.cc
index baf5354..72b366e 100644
--- a/pn8x/halimpl/tml/phTmlNfc.cc
+++ b/pn8x/halimpl/tml/phTmlNfc.cc
@@ -153,7 +153,7 @@
   /* Clean up all the TML resources if any error */
   if (NFCSTATUS_SUCCESS != wInitStatus) {
     /* Clear all handles and memory locations initialized during init */
-    phTmlNfc_CleanUp();
+    phTmlNfc_Shutdown_CleanUp();
   }
 
   return wInitStatus;