diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 93f3f0aa..afcb1f51 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -404,8 +404,5 @@ BOARD_KERNEL_CMDLINE += at24.write_timeout=100
 # Enable larger logbuf
 BOARD_KERNEL_CMDLINE += log_buf_len=1024K
 
-# Enable load module in parallel
-BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true
-
 # Protected VM firmware
 BOARD_PVMFWIMAGE_PARTITION_SIZE := 0x00100000
diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc
index 5a2ff6b8..220ba139 100644
--- a/conf/init.gs201.rc
+++ b/conf/init.gs201.rc
@@ -906,6 +906,9 @@ on post-fs-data
     mkdir /data/vendor/powerstats 0771 system system
     chown system system /data/vendor/powerstats
 
+on late-init && property:ro.boot.hw.soc.rev=0
+    setprop vendor.thermal.config "thermal_info_config_A0.json"
+
 on property:vendor.thermal.link_ready=1
     # BCL
     write /sys/devices/virtual/pmic/mitigation/clock_ratio/tpu_light_clk_ratio 0xfff041c1 #DFS
diff --git a/device.mk b/device.mk
index acf73853..e4be22b5 100644
--- a/device.mk
+++ b/device.mk
@@ -404,9 +404,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 	persist.vendor.usb.usbradio.config=dm
 endif
 
-# adpf 16ms update rate
-PRODUCT_PRODUCT_PROPERTIES += \
-        vendor.powerhal.adpf.rate=16666666
 
 PRODUCT_COPY_FILES += \
 	device/google/gs201/task_profiles.json:$(TARGET_COPY_OUT_VENDOR)/etc/task_profiles.json
@@ -900,10 +897,13 @@ PRODUCT_PACKAGES += modem_logging_control
 
 # modem logging configs
 PRODUCT_COPY_FILES += \
-	device/google/gs201/radio/config/logging.conf:$(TARGET_COPY_OUT_VENDOR)/etc/modem/logging.conf \
-	device/google/gs201/radio/config/default.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/modem/default.cfg \
-	device/google/gs201/radio/config/default.nprf:$(TARGET_COPY_OUT_VENDOR)/etc/modem/default.nprf \
-	device/google/gs201/radio/config/default_metrics.xml:$(TARGET_COPY_OUT_VENDOR)/etc/modem/default_metrics.xml
+	device/google/$(TARGET_BOARD_PLATFORM)/radio/config/logging.conf:$(TARGET_COPY_OUT_VENDOR)/etc/modem/logging.conf \
+	device/google/$(TARGET_BOARD_PLATFORM)/radio/config/default.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/modem/default.cfg \
+	device/google/$(TARGET_BOARD_PLATFORM)/radio/config/default.nprf:$(TARGET_COPY_OUT_VENDOR)/etc/modem/default.nprf \
+	device/google/$(TARGET_BOARD_PLATFORM)/radio/config/default_metrics.xml:$(TARGET_COPY_OUT_VENDOR)/etc/modem/default_metrics.xml \
+	device/google/$(TARGET_BOARD_PLATFORM)/radio/config/Pixel_Default.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/modem/Pixel_Default.cfg \
+	device/google/$(TARGET_BOARD_PLATFORM)/radio/config/Pixel_Default.nprf:$(TARGET_COPY_OUT_VENDOR)/etc/modem/Pixel_Default.nprf \
+	device/google/$(TARGET_BOARD_PLATFORM)/radio/config/Pixel_Default_metrics.xml:$(TARGET_COPY_OUT_VENDOR)/etc/modem/Pixel_Default_metrics.xml \
 
 # ARM NN files
 ARM_COMPUTE_CL_ENABLE := 1
@@ -1026,8 +1026,9 @@ PRODUCT_PACKAGES += \
 include device/google/gs101/telephony/pktrouter.mk
 
 # Thermal HAL
-include hardware/google/pixel/thermal/device.mk
 PRODUCT_PROPERTY_OVERRIDES += persist.vendor.enable.thermal.genl=true
+include hardware/google/pixel/thermal/device.mk
+$(call soong_config_set,thermal_hal_feature,pid,apply_2_0)
 
 ## TPU packages
 include device/google/gs201/edgetpu/edgetpu.mk
@@ -1074,6 +1075,9 @@ include hardware/google/pixel/PixelLogger/PixelLogger.mk
 # sscoredump
 include hardware/google/pixel/sscoredump/device.mk
 
+# RadioExt Version
+USES_RADIOEXT_V1_4 = true
+
 # Wifi ext
 include hardware/google/pixel/wifi_ext/device.mk
 
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 63ef09f5..10503297 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -196,7 +196,7 @@
     </hal>
     <hal format="hidl" optional="true">
         <name>vendor.google.radioext</name>
-        <version>1.3</version>
+        <version>1.4</version>
         <interface>
             <name>IRadioExt</name>
             <instance>default</instance>