diff --git a/audio/comet/tuning/apmg3/downlink_dock_config.pb b/audio/comet/tuning/apmg3/downlink_dock_config.pb
index 2fdd177..854a48d 100644
Binary files a/audio/comet/tuning/apmg3/downlink_dock_config.pb and b/audio/comet/tuning/apmg3/downlink_dock_config.pb differ
diff --git a/audio/comet/tuning/apmg3/downlink_speaker_config.pb b/audio/comet/tuning/apmg3/downlink_speaker_config.pb
index 522c721..f8cee42 100644
Binary files a/audio/comet/tuning/apmg3/downlink_speaker_config.pb and b/audio/comet/tuning/apmg3/downlink_speaker_config.pb differ
diff --git a/audio/comet/tuning/apmg3/uplink_dock_aec_off_config.pb b/audio/comet/tuning/apmg3/uplink_dock_aec_off_config.pb
index fb82a78..06e4ef5 100644
Binary files a/audio/comet/tuning/apmg3/uplink_dock_aec_off_config.pb and b/audio/comet/tuning/apmg3/uplink_dock_aec_off_config.pb differ
diff --git a/audio/comet/tuning/apmg3/uplink_dock_aec_on_config.pb b/audio/comet/tuning/apmg3/uplink_dock_aec_on_config.pb
index a6bb5a4..979a200 100644
Binary files a/audio/comet/tuning/apmg3/uplink_dock_aec_on_config.pb and b/audio/comet/tuning/apmg3/uplink_dock_aec_on_config.pb differ
diff --git a/audio/comet/tuning/apmg3/uplink_speaker_aec_on_config.pb b/audio/comet/tuning/apmg3/uplink_speaker_aec_on_config.pb
index a844b03..64b3d85 100644
Binary files a/audio/comet/tuning/apmg3/uplink_speaker_aec_on_config.pb and b/audio/comet/tuning/apmg3/uplink_speaker_aec_on_config.pb differ
diff --git a/conf/init.comet.rc b/conf/init.comet.rc
index c9c59ab..a6b567f 100644
--- a/conf/init.comet.rc
+++ b/conf/init.comet.rc
@@ -7,6 +7,7 @@ on init && property:ro.vendor.factory=1
 on init
     # eSE streset tool name
     setprop persist.vendor.se.streset libstreset24
+    setprop persist.vendor.nfc.streset libstreset24
 # No se_chip_en for P1.0
 on late-init && property:ro.boot.hardware.revision=PROTO1.0
     setprop persist.vendor.se.reset.chip_en false
diff --git a/device-comet.mk b/device-comet.mk
index df07be3..42299bd 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -14,6 +14,8 @@
 # limitations under the License.
 #
 
+SHIPPING_API_LEVEL := 34
+
 ifdef RELEASE_GOOGLE_COMET_RADIO_DIR
 RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_COMET_RADIO_DIR)
 endif