diff --git a/device.mk b/device.mk
index 41ba5950..8a468d7c 100644
--- a/device.mk
+++ b/device.mk
@@ -54,8 +54,6 @@ PRODUCT_SOONG_NAMESPACES += \
 	vendor/google_nos/test/system-test-harness \
 	vendor/google/camera
 
-DEVICE_USES_EXYNOS_GRALLOC_VERSION := 4
-
 LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image.lz4
 
 # OEM Unlock reporting
@@ -204,13 +202,8 @@ PRODUCT_VENDOR_PROPERTIES += \
 # ####################
 
 # Device Manifest, Device Compatibility Matrix for Treble
-ifeq ($(DEVICE_USES_EXYNOS_GRALLOC_VERSION), 4)
-	DEVICE_MANIFEST_FILE := \
-		device/google/gs201/manifest.xml
-else
-	DEVICE_MANIFEST_FILE := \
-		device/google/gs201/manifest-gralloc3.xml
-endif
+DEVICE_MANIFEST_FILE := \
+	device/google/gs201/manifest.xml
 
 ifneq (,$(filter aosp_%,$(TARGET_PRODUCT)))
 DEVICE_MANIFEST_FILE += \
@@ -450,19 +443,11 @@ PRODUCT_PROPERTY_OVERRIDES += aaudio.hw_burst_min_usec=2000
 PRODUCT_PACKAGES += \
 	com.android.future.usb.accessory
 
-# for now include gralloc here. should come from hardware/google_devices/exynos5
-ifeq ($(DEVICE_USES_EXYNOS_GRALLOC_VERSION), 4)
-	PRODUCT_PACKAGES += \
-		android.hardware.graphics.mapper@4.0-impl \
-		android.hardware.graphics.allocator@4.0-service \
-		android.hardware.graphics.allocator@4.0-impl
-else
-	PRODUCT_PACKAGES += \
-		android.hardware.graphics.mapper@2.0-impl \
-		android.hardware.graphics.allocator@2.0-service \
-		android.hardware.graphics.allocator@2.0-impl \
-		gralloc.$(TARGET_BOARD_PLATFORM)
-endif
+PRODUCT_PACKAGES += \
+	android.hardware.graphics.mapper@4.0-impl \
+	android.hardware.graphics.allocator@4.0-service \
+	android.hardware.graphics.allocator@4.0-impl \
+	android.hardware.graphics.allocator-V1-service
 
 # AIDL memtrack
 PRODUCT_PACKAGES += \
@@ -856,8 +841,8 @@ SUPPORT_MULTI_SIM := true
 SUPPORT_NR := true
 # Support 5G on both stacks
 SUPPORT_NR_DS := true
-# Using IRadio 1.6
-USE_RADIO_HAL_1_6 := true
+# Using IRadio 2.0
+USE_RADIO_HAL_2_0 := true
 
 #$(call inherit-product, vendor/google_devices/telephony/common/device-vendor.mk)
 #$(call inherit-product, vendor/google_devices/gs201/proprietary/device-vendor.mk)
@@ -922,7 +907,7 @@ PRODUCT_PACKAGES += \
 	android.hardware.audio.effect@7.0-impl \
 	android.hardware.soundtrigger@2.3-impl \
 	vendor.google.whitechapel.audio.audioext@3.0-impl \
-	android.hardware.bluetooth.audio@2.1-impl
+	android.hardware.bluetooth.audio-impl \
 
 #
 ##Audio HAL libraries
diff --git a/manifest.xml b/manifest.xml
index b80598c0..716d5bf1 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -71,15 +71,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.bluetooth.audio</name>
-        <transport>hwbinder</transport>
-        <version>2.1</version>
-        <interface>
-            <name>IBluetoothAudioProvidersFactory</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.boot</name>
         <transport>hwbinder</transport>
diff --git a/overlay/packages/apps/Settings/res/values/bools.xml b/overlay/packages/apps/Settings/res/values/bools.xml
new file mode 100755
index 00000000..4b5496fe
--- /dev/null
+++ b/overlay/packages/apps/Settings/res/values/bools.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2022 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <!-- Whether to show a preference item for mobile plan -->
+    <bool name="config_show_mobile_plan">false</bool>
+</resources>
diff --git a/overlay/packages/apps/Settings/res/values/config.xml b/overlay/packages/apps/Settings/res/values/config.xml
new file mode 100755
index 00000000..7bd1f0d5
--- /dev/null
+++ b/overlay/packages/apps/Settings/res/values/config.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2022 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <!-- Whether to aggregate for network selection list-->
+    <bool name="config_network_selection_list_aggregation_enabled">true</bool>
+
+    <!-- The switch preference's default value of connectivity helper call quality-->
+    <bool name="config_show_connectivity_helper_call_quality">true</bool>
+    <!-- The switch preference's default value of connectivity helper DeviceToDevice-->
+    <bool name="config_show_connectivity_helper_d2d">true</bool>
+</resources>