diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index d5e67aca..fdf9ef83 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -60,6 +60,7 @@ AB_OTA_UPDATER := true
 
 AB_OTA_PARTITIONS += \
 	system \
+	system_dlkm \
 	system_ext \
 	product \
 	vbmeta_system
@@ -127,7 +128,7 @@ endif
 #BOARD_USES_EXYNOS_DATASPACE_FEATURE := true
 
 # Enable chain partition for system.
-BOARD_AVB_VBMETA_SYSTEM := system system_ext product
+BOARD_AVB_VBMETA_SYSTEM := system system_dlkm system_ext product
 BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
 BOARD_AVB_VBMETA_SYSTEM_ALGORITHM := SHA256_RSA2048
 BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
@@ -184,6 +185,7 @@ BOARD_SUPER_PARTITION_GROUPS := google_dynamic_partitions
 BOARD_GOOGLE_DYNAMIC_PARTITIONS_SIZE := 8527020032
 BOARD_GOOGLE_DYNAMIC_PARTITIONS_PARTITION_LIST := \
     system \
+    system_dlkm \
     system_ext \
     product \
     vendor \
@@ -192,6 +194,11 @@ BOARD_GOOGLE_DYNAMIC_PARTITIONS_PARTITION_LIST := \
 # Set error limit to BOARD_SUPER_PARTITON_SIZE - 500MB
 BOARD_SUPER_PARTITION_ERROR_LIMIT := 8006926336
 
+# Build a separate system_dlkm partition
+BOARD_USES_SYSTEM_DLKMIMAGE := true
+BOARD_SYSTEM_DLKMIMAGE_FILE_SYSTEM_TYPE := erofs
+TARGET_COPY_OUT_SYSTEM_DLKM := system_dlkm
+
 #
 # AUDIO & VOICE
 #
diff --git a/conf/fstab.gs201.in b/conf/fstab.gs201.in
index 242813ec..2fe2161f 100644
--- a/conf/fstab.gs201.in
+++ b/conf/fstab.gs201.in
@@ -7,6 +7,7 @@
 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_dlkm                                              /system_dlkm                erofs   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/conf/init.gs201.rc b/conf/init.gs201.rc
index 1c499b4e..25dcadeb 100644
--- a/conf/init.gs201.rc
+++ b/conf/init.gs201.rc
@@ -535,6 +535,7 @@ on fs
     chown system system /sys/devices/platform/exynos-drm/primary-panel/min_vrefresh
     chown system system /sys/devices/platform/exynos-drm/primary-panel/idle_delay_ms
     chown system system /sys/devices/platform/exynos-drm/primary-panel/panel_idle
+    chown system system /sys/devices/platform/exynos-drm/primary-panel/panel_need_handle_idle_exit
     chown system system /sys/module/drm/parameters/vblankoffdelay
     chown system system /sys/class/dqe0/atc/ambient_light
     chown system system /sys/class/dqe0/atc/st
diff --git a/usb/gadget/Android.bp b/usb/gadget/Android.bp
index 9b22e766..502c339f 100644
--- a/usb/gadget/Android.bp
+++ b/usb/gadget/Android.bp
@@ -13,6 +13,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "device_google_gs201_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["device_google_gs201_license"],
+}
+
 cc_binary {
     name: "android.hardware.usb.gadget-service",
     relative_install_path: "hw",