diff --git a/OWNERS b/OWNERS
index 9456ca0..72b1f7a 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,2 +1,4 @@
+per-file perf/*,thermal/*= jenhaochen@google.com,wvw@google.com,joaodias@google.com,sayanna@google.com,liumartin@google.com,kamewang@google.com
+
 # per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details.
 per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/OWNERS
diff --git a/device-comet.mk b/device-comet.mk
index 11b2b08..d8716df 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -24,7 +24,6 @@ RELEASE_GOOGLE_BOOTLOADER_COMET_DIR ?= 24D1# Keep this for pdk TODO: b/327119000
 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_COMET_DIR)
 $(call soong_config_set,comet_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_COMET_DIR))
 
-
 TARGET_LINUX_KERNEL_VERSION ?= 6.1
 ifdef RELEASE_KERNEL_COMET_DIR
 TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_COMET_DIR)
@@ -69,6 +68,10 @@ include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/touch/gti/predump_gti_dual.mk
 include device/google/gs-common/display/dump_second_display.mk
 
+# Increment the SVN for any official public releases
+PRODUCT_VENDOR_PROPERTIES += \
+    ro.vendor.build.svn=1
+
 # go/lyric-soong-variables
 $(call soong_config_set,lyric,camera_hardware,comet)
 $(call soong_config_set,lyric,tuning_product,comet)
@@ -358,6 +361,10 @@ PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.udfps.als_feed_forward_supported=true \
     persist.vendor.udfps.lhbm_controlled_in_hal_supported=true
 
+# Allow external binning setting
+PRODUCT_VENDOR_PROPERTIES += \
+    persist.vendor.camera.allow_external_binning_setting=true
+
 # Camera Vendor property
 PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.camera.front_720P_always_binning=true
@@ -475,3 +482,7 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PACKAGES += \
    com.google.comet.hardware.threadnetwork
 endif
+
+# Camera concurrent foldable dual front feature support
+PRODUCT_PACKAGES += \
+    concurrent_foldable_dual_front_xml
diff --git a/location/user/gps.cfg b/location/user/gps.cfg
index 392b06f..c75f395 100644
--- a/location/user/gps.cfg
+++ b/location/user/gps.cfg
@@ -70,6 +70,7 @@ IsUseEntireRespTime911=1
 isForceHighAccuracyMode=1
 cp_partial_reset_disable=1
 isUseUncalAccel=1
+isUseUncalMagn=0
 
 GNSS_CARRIER_CONFIG_BEGIN
 GNSS_CARRIER_ID=0
diff --git a/location/userdebug/gps.cfg b/location/userdebug/gps.cfg
index e3f79ea..0168a82 100644
--- a/location/userdebug/gps.cfg
+++ b/location/userdebug/gps.cfg
@@ -208,8 +208,9 @@ isForceHighAccuracyMode=1
 # 1       = CP partial reset feature disabled
 cp_partial_reset_disable=1
 
-# 0: Use calibrated Accel data 1: Use uncalibrated Accel data
+# 0: Use calibrated data 1: Use uncalibrated data
 isUseUncalAccel=1
+isUseUncalMagn=0
 
 GNSS_CARRIER_CONFIG_BEGIN
 # DEFAULT