diff --git a/conf/fstab.gs201.in b/conf/fstab.gs201.in
index 8d7ee918..a3cdfe0a 100644
--- a/conf/fstab.gs201.in
+++ b/conf/fstab.gs201.in
@@ -5,6 +5,8 @@
 #
 #<src>                                                   <mnt_point>                 <type>  <mnt_flags and options>  <fs_mgr_flags>
 system                                                   /system                     erofs   ro                       wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128
+# During compliance testing, the previous line would fail (because GSI is ext4), and the next line would be used to mount GSI.
+system                                                   /system                     ext4    ro,barrier=1             wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128
 system_ext                                               /system_ext                 erofs   ro                       wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128
 product                                                  /product                    erofs   ro                       wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128
 vendor                                                   /vendor                     erofs   ro                       wait,slotselect,avb=vbmeta_vendor,logical,first_stage_mount,readahead_size_kb=128
diff --git a/device-common.mk b/device-common.mk
index 994e0e43..35f04042 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -35,5 +35,10 @@ PRODUCT_VENDOR_PROPERTIES += ro.soc.model=GS201
 PRODUCT_PRODUCT_PROPERTIES += \
     persist.vendor.testing_battery_profile=2
 
+# The default value of this variable is false and should only be set to true when
+# the device allows users to retain eSIM profiles after factory reset of user data.
+PRODUCT_PRODUCT_PROPERTIES += \
+    masterclear.allow_retain_esim_profiles_after_fdr=true
+
 # ZramWriteback
 -include hardware/google/pixel/mm/device_gki.mk
diff --git a/device.mk b/device.mk
index 8f073090..9b18fe53 100644
--- a/device.mk
+++ b/device.mk
@@ -114,6 +114,10 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_PRODUCT_PROPERTIES += \
 	persist.radio.reboot_on_modem_change=false
 
+# Configure DSDS by default
+PRODUCT_PRODUCT_PROPERTIES += \
+	persist.radio.multisim.config=dsds
+
 # Enable Early Camping
 PRODUCT_PRODUCT_PROPERTIES += \
 	persist.vendor.ril.camp_on_earlier=1
@@ -229,7 +233,7 @@ DEVICE_MATRIX_FILE := \
 DEVICE_PACKAGE_OVERLAYS += device/google/gs201/overlay
 
 # This will be updated to 33 (Android T) for shipping
-PRODUCT_SHIPPING_API_LEVEL := 31
+PRODUCT_SHIPPING_API_LEVEL := 32
 
 # Temporarily disable the debugfs restriction on 31 (Android S)
 PRODUCT_SET_DEBUGFS_RESTRICTIONS := false
@@ -242,7 +246,7 @@ PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE := true
 PRODUCT_COPY_FILES += \
 	$(LOCAL_KERNEL):kernel \
 	device/google/gs201/conf/init.gs201.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs201.usb.rc \
-	device/google/gs201/conf/ueventd.gs201.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc
+	device/google/gs201/conf/ueventd.gs201.rc:$(TARGET_COPY_OUT_VENDOR)/etc/ueventd.rc
 
 PRODUCT_COPY_FILES += \
 	device/google/gs201/conf/init.gs201.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs201.rc
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 72d536f7..2ac454af 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -31,7 +31,7 @@
             <instance>dual</instance>
         </interface>
     </hal>
-    <hal format="aidl">
+    <hal format="aidl" optional="true">
         <name>android.hardware.wifi.hostapd</name>
         <version>1</version>
         <interface>
diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
index 9be63e78..899db4ab 100644
--- a/dumpstate/DumpstateDevice.cpp
+++ b/dumpstate/DumpstateDevice.cpp
@@ -71,7 +71,7 @@ namespace implementation {
 
 typedef std::chrono::time_point<std::chrono::steady_clock> timepoint_t;
 
-const char kVerboseLoggingProperty[] = "persist.dumpstate.verbose_logging.enabled";
+const char kVerboseLoggingProperty[] = "persist.vendor.verbose_logging_enabled";
 
 void DumpstateDevice::dumpLogs(int fd, std::string srcDir, std::string destDir, int maxFileNum,
                                const char *logPrefix) {