diff --git a/aosp_husky_fullmte.mk b/aosp_husky_fullmte.mk
index a8429e5..06a5db0 100644
--- a/aosp_husky_fullmte.mk
+++ b/aosp_husky_fullmte.mk
@@ -1,5 +1,4 @@
-include device/google/shusky/fullmte-vars.mk
+include device/google/gs-common/mte/fullmte-pixel.mk
 $(call inherit-product, device/google/shusky/aosp_husky.mk)
-$(call inherit-product, device/google/shusky/fullmte-common.mk)
 
 PRODUCT_NAME := aosp_husky_fullmte
diff --git a/aosp_ripcurrent_fullmte.mk b/aosp_ripcurrent_fullmte.mk
index 781137a..b7dc289 100644
--- a/aosp_ripcurrent_fullmte.mk
+++ b/aosp_ripcurrent_fullmte.mk
@@ -1,5 +1,4 @@
-include device/google/shusky/fullmte-vars.mk
+include device/google/gs-common/mte/fullmte-pixel.mk
 $(call inherit-product, device/google/shusky/aosp_ripcurrent.mk)
-$(call inherit-product, device/google/shusky/fullmte-common.mk)
 
 PRODUCT_NAME := aosp_ripcurrent_fullmte
diff --git a/aosp_shiba_fullmte.mk b/aosp_shiba_fullmte.mk
index 76333e0..8f31bd5 100644
--- a/aosp_shiba_fullmte.mk
+++ b/aosp_shiba_fullmte.mk
@@ -1,5 +1,4 @@
-include device/google/shusky/fullmte-vars.mk
+include device/google/gs-common/mte/fullmte-pixel.mk
 $(call inherit-product, device/google/shusky/aosp_shiba.mk)
-$(call inherit-product, device/google/shusky/fullmte-common.mk)
 
 PRODUCT_NAME := aosp_shiba_fullmte
diff --git a/device-husky.mk b/device-husky.mk
index e61db63..bab1542 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -36,7 +36,8 @@ DEVICE_PACKAGE_OVERLAYS += device/google/shusky/husky/overlay
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.ignore_hdr_camera_layers=true
 
 PRODUCT_COPY_FILES += \
-	device/google/shusky/husky/display_colordata_dev_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_dev_cal0.pb
+	device/google/shusky/husky/display_colordata_dev_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_dev_cal0.pb \
+    device/google/shusky/husky/display_golden_google-hk3_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_golden_google-hk3_cal0.pb
 
 include device/google/shusky/audio/husky/audio-tables.mk
 include device/google/zuma/device-shipping-common.mk
diff --git a/device-shiba.mk b/device-shiba.mk
index 1737971..ceeef17 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -279,7 +279,9 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 PRODUCT_COPY_FILES += \
 	device/google/shusky/shiba/display_colordata_google-bigsurf_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_google-bigsurf_cal0.pb \
-	device/google/shusky/shiba/display_colordata_google-shoreline_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_google-shoreline_cal0.pb
+	device/google/shusky/shiba/display_colordata_google-shoreline_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_google-shoreline_cal0.pb \
+    device/google/shusky/shiba/display_golden_google-bigsurf_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_golden_google-bigsurf_cal0.pb \
+    device/google/shusky/shiba/display_golden_google-shoreline_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_golden_google-shoreline_cal0.pb
 
 # Camera Vendor property
 PRODUCT_VENDOR_PROPERTIES += \
diff --git a/fullmte-common.mk b/fullmte-common.mk
deleted file mode 100644
index 1591a33..0000000
--- a/fullmte-common.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-BOARD_KERNEL_CMDLINE += bootloader.pixel.MTE_FORCE_ON
-PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.default=sync
diff --git a/fullmte-vars.mk b/fullmte-vars.mk
deleted file mode 100644
index c8c87ff..0000000
--- a/fullmte-vars.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-ifeq ($(filter memtag_heap,$(SANITIZE_TARGET)),)
-  SANITIZE_TARGET := $(strip $(SANITIZE_TARGET) memtag_heap memtag_stack)
-  SANITIZE_TARGET_DIAG := $(strip $(SANITIZE_TARGET_DIAG) memtag_heap)
-endif
diff --git a/husky/display_golden_google-hk3_cal0.pb b/husky/display_golden_google-hk3_cal0.pb
new file mode 100644
index 0000000..75fef40
Binary files /dev/null and b/husky/display_golden_google-hk3_cal0.pb differ
diff --git a/location/gps.xml b/location/gps.xml
index 013d2a0..64f6336 100644
--- a/location/gps.xml
+++ b/location/gps.xml
@@ -35,7 +35,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
+       SuplOtdoaCapable2="false"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
diff --git a/location/gps.xml.hk3 b/location/gps.xml.hk3
index 1640d87..0e1d7f6 100644
--- a/location/gps.xml.hk3
+++ b/location/gps.xml.hk3
@@ -35,7 +35,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
+       SuplOtdoaCapable2="false"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
diff --git a/location/gps.xml.sb3 b/location/gps.xml.sb3
index 015e0d8..dcb56ff 100644
--- a/location/gps.xml.sb3
+++ b/location/gps.xml.sb3
@@ -35,7 +35,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
+       SuplOtdoaCapable2="false"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
diff --git a/location/gps_user.xml b/location/gps_user.xml
index 713c43b..c082719 100644
--- a/location/gps_user.xml
+++ b/location/gps_user.xml
@@ -34,7 +34,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
+       SuplOtdoaCapable2="false"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
diff --git a/location/gps_user.xml.hk3 b/location/gps_user.xml.hk3
index 015ea13..968fb0a 100644
--- a/location/gps_user.xml.hk3
+++ b/location/gps_user.xml.hk3
@@ -34,7 +34,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
+       SuplOtdoaCapable2="false"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
diff --git a/location/gps_user.xml.sb3 b/location/gps_user.xml.sb3
index f12eecc..34a2a04 100644
--- a/location/gps_user.xml.sb3
+++ b/location/gps_user.xml.sb3
@@ -34,7 +34,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
+       SuplOtdoaCapable2="false"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json
index 0af507d..86438df 100644
--- a/perf/powerhint-husky.json
+++ b/perf/powerhint-husky.json
@@ -6,7 +6,8 @@
       "Values": [
         "1",
         "0"
-      ]
+      ],
+      "WriteOnly": true
     },
     {
       "Name": "GPUMinFreq",
diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json
index 9631195..f745ec0 100644
--- a/perf/powerhint-ripcurrent.json
+++ b/perf/powerhint-ripcurrent.json
@@ -6,7 +6,8 @@
       "Values": [
         "1",
         "0"
-      ]
+      ],
+      "WriteOnly": true
     },
     {
       "Name": "GPUMinFreq",
diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json
index a0de305..3d56d8b 100644
--- a/perf/powerhint-shiba.json
+++ b/perf/powerhint-shiba.json
@@ -6,7 +6,8 @@
       "Values": [
         "1",
         "0"
-      ]
+      ],
+      "WriteOnly": true
     },
     {
       "Name": "GPUMinFreq",
diff --git a/shiba/display_golden_google-bigsurf_cal0.pb b/shiba/display_golden_google-bigsurf_cal0.pb
new file mode 100644
index 0000000..32de5d6
Binary files /dev/null and b/shiba/display_golden_google-bigsurf_cal0.pb differ
diff --git a/shiba/display_golden_google-shoreline_cal0.pb b/shiba/display_golden_google-shoreline_cal0.pb
new file mode 100644
index 0000000..592f8cc
Binary files /dev/null and b/shiba/display_golden_google-shoreline_cal0.pb differ