DO NOT MERGE -- Merge PPRL.190405.003 into master

Bug: 130175407
Change-Id: Iefbd76b86d586032d3d8582335979dc3358c2269
diff --git a/nfc/libnfc-nxp.taimen.conf b/nfc/libnfc-nxp.taimen.conf
index 1411ac8..c239f82 100644
--- a/nfc/libnfc-nxp.taimen.conf
+++ b/nfc/libnfc-nxp.taimen.conf
@@ -246,7 +246,7 @@
 
 ###############################################################################
 # Core configuration settings
-NXP_CORE_CONF={ 20, 02, 31, 0F,
+NXP_CORE_CONF={ 20, 02, 2D, 0F,
         85, 01, 01,
         28, 01, 00,
         21, 01, 00,
@@ -254,7 +254,7 @@
         31, 01, 03,
         32, 01, 60,
         38, 01, 01,
-        33, 04, 01, 02, 03, 04,
+        33, 00,
         54, 01, 06,
         50, 01, 02,
         5B, 01, 00,