diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 82b54fe8..3867e7df 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -104,6 +104,7 @@ BOARD_EGL_CFG := device/google/gs201/conf/egl.cfg
 USE_OPENGL_RENDERER := true
 NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
 BOARD_USES_EXYNOS5_COMMON_GRALLOC := true
+BOARD_USES_EXYNOS_GRALLOC_VERSION := $(DEVICE_USES_EXYNOS_GRALLOC_VERSION)
 BOARD_USES_ALIGN_RESTRICTION := false
 BOARD_USES_GRALLOC_ION_SYNC := true
 
@@ -111,6 +112,8 @@ BOARD_USES_GRALLOC_ION_SYNC := true
 BOARD_USES_SWIFTSHADER := false
 
 # Gralloc4
+ifeq ($(BOARD_USES_EXYNOS_GRALLOC_VERSION),4)
+
 ifeq ($(BOARD_USES_SWIFTSHADER),true)
 $(call soong_config_set,arm_gralloc,gralloc_arm_no_external_afbc,true)
 $(call soong_config_set,arm_gralloc,mali_gpu_support_afbc_basic,false)
@@ -124,8 +127,15 @@ $(call soong_config_set,arm_gralloc,mali_gpu_support_afbc_wideblk,true)
 $(call soong_config_set,arm_gralloc,gralloc_init_afbc,true)
 $(call soong_config_set,arm_gralloc,dpu_support_1010102_afbc,true)
 endif # ifeq ($(BOARD_USES_SWIFTSHADER),true)
-
 $(call soong_config_set,arm_gralloc,gralloc_ion_sync_on_lock,$(BOARD_USES_GRALLOC_ION_SYNC))
+endif # ifeq ($(BOARD_USES_EXYNOS_GRALLOC_VERSION),4)
+
+# libVendorGraphicbuffer
+ifeq ($(BOARD_USES_EXYNOS_GRALLOC_VERSION),4)
+$(call soong_config_set,vendorgraphicbuffer,gralloc_version,four)
+else
+$(call soong_config_set,vendorgraphicbuffer,gralloc_version,three)
+endif
 
 # Graphics
 #BOARD_USES_EXYNOS_DATASPACE_FEATURE := true
diff --git a/device-common.mk b/device-common.mk
index 35f04042..0ceb1242 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -16,6 +16,7 @@
 
 -include vendor/google_devices/gs201/proprietary/telephony/device-vendor.mk
 include device/google/gs201/device.mk
+include device/google/gs101/tts/voice_packs.mk
 
 # Telephony
 PRODUCT_COPY_FILES += \
diff --git a/device.mk b/device.mk
index 0e440c7d..51aa598f 100644
--- a/device.mk
+++ b/device.mk
@@ -122,14 +122,15 @@ PRODUCT_PRODUCT_PROPERTIES += \
 
 # Set the Bluetooth Class of Device
 # Service Field: 0x5A -> 90
+#    Bit 14: LE audio
 #    Bit 17: Networking
 #    Bit 19: Capturing
 #    Bit 20: Object Transfer
 #    Bit 22: Telephony
-# MAJOR_CLASS: 0x02 -> 2 (Phone)
+# MAJOR_CLASS: 0x42 -> 66 (Phone)
 # MINOR_CLASS: 0x0C -> 12 (Smart Phone)
 PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.device.class_of_device=90,2,12
+    bluetooth.device.class_of_device=90,66,12
 
 # Set supported Bluetooth profiles to enabled
 PRODUCT_PRODUCT_PROPERTIES += \
@@ -1113,6 +1114,10 @@ DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE := device/google/gs201/device_framework
 PRODUCT_DEXPREOPT_SPEED_APPS += \
     SystemUIGoogle
 
+# Compile SystemUI on device with `speed`.
+PRODUCT_PROPERTY_OVERRIDES += \
+    dalvik.vm.systemuicompilerfilter=speed
+
 # Keymint configuration
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.software.device_id_attestation.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.device_id_attestation.xml \
diff --git a/gnss/47765/config/lhd.conf b/gnss/47765/config/lhd.conf
index c000d582..efde25ba 100644
--- a/gnss/47765/config/lhd.conf
+++ b/gnss/47765/config/lhd.conf
@@ -31,4 +31,3 @@ SecondaryConfigPath=/data/vendor/gps/overlay/lhd_overlay.conf
 
 SkipSensorWakeLock=true
 LoggerWakeLockEnable=false
-PpsEnable=true
diff --git a/gnss/47765/config/lhd_user.conf b/gnss/47765/config/lhd_user.conf
index 682d03a3..0216ace9 100644
--- a/gnss/47765/config/lhd_user.conf
+++ b/gnss/47765/config/lhd_user.conf
@@ -29,4 +29,3 @@ TrafficLogEnabled=false
 
 SkipSensorWakeLock=true
 LoggerWakeLockEnable=false
-PpsEnable=true
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 7e7e0aee..1f1bceac 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -280,4 +280,13 @@
 
     <!-- Enable Zram writeback feature to allow unused pages in zram be written to flash. -->
     <bool name="config_zramWriteback">true</bool>
+
+    <!-- List of system components which are allowed to receive ServiceState entries in an
+     un-sanitized form, even if the location toggle is off. This is intended ONLY for system
+     components, such as the telephony stack, which require access to the full ServiceState for
+     tasks such as network registration. -->
+    <string-array name="config_serviceStateLocationAllowedPackages">
+        <item>"com.shannon.imsservice"</item>
+        <item>"com.android.phone"</item>
+    </string-array>
 </resources>
diff --git a/powerstats/Gs201CommonDataProviders.cpp b/powerstats/Gs201CommonDataProviders.cpp
index 4ce104fb..a6f08722 100644
--- a/powerstats/Gs201CommonDataProviders.cpp
+++ b/powerstats/Gs201CommonDataProviders.cpp
@@ -165,22 +165,6 @@ void addDvfsStats(std::shared_ptr<PowerStats> p) {
 
     std::vector<DvfsStateResidencyDataProvider::Config> cfgs;
 
-    cfgs.push_back({"MIF", {
-        std::make_pair("3172MHz", "3172000"),
-        std::make_pair("2730MHz", "2730000"),
-        std::make_pair("2535MHz", "2535000"),
-        std::make_pair("2288MHz", "2288000"),
-        std::make_pair("2028MHz", "2028000"),
-        std::make_pair("1716MHz", "1716000"),
-        std::make_pair("1539MHz", "1539000"),
-        std::make_pair("1352MHz", "1352000"),
-        std::make_pair("1014MHz", "1014000"),
-        std::make_pair("845MHz", "845000"),
-        std::make_pair("676MHz", "676000"),
-        std::make_pair("546MHz", "546000"),
-        std::make_pair("421MHz", "421000"),
-    }});
-
     cfgs.push_back({"CL0", {
         std::make_pair("2024MHz", "2024000"),
         std::make_pair("1950MHz", "1950000"),
@@ -580,6 +564,10 @@ void addPowerDomains(std::shared_ptr<PowerStats> p) {
 }
 
 void addDevfreq(std::shared_ptr<PowerStats> p) {
+    p->addStateResidencyDataProvider(std::make_unique<DevfreqStateResidencyDataProvider>(
+            "MIF",
+            "/sys/devices/platform/17000010.devfreq_mif/devfreq/17000010.devfreq_mif"));
+
     p->addStateResidencyDataProvider(std::make_unique<DevfreqStateResidencyDataProvider>(
             "INT",
             "/sys/devices/platform/17000020.devfreq_int/devfreq/17000020.devfreq_int"));
diff --git a/radio/config/Pixel_Default.nprf b/radio/config/Pixel_Default.nprf
index fdd0eabe..9a01a545 100644
Binary files a/radio/config/Pixel_Default.nprf and b/radio/config/Pixel_Default.nprf differ