diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 681bb146..fd777786 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -22,6 +22,7 @@ TARGET_SOC := gs201
 TARGET_SOC_NAME := google
 
 USES_DEVICE_GOOGLE_GS201 := true
+$(call soong_config_set,CitadelProvision,target_soc,gs201)
 
 TARGET_ARCH := arm64
 TARGET_ARCH_VARIANT := armv8-2a
@@ -49,6 +50,7 @@ BOARD_KERNEL_CMDLINE += cgroup_disable=memory
 BOARD_KERNEL_CMDLINE += rcupdate.rcu_expedited=1 rcu_nocbs=all rcutree.enable_rcu_lazy
 BOARD_KERNEL_CMDLINE += stack_depot_disable=off page_pinner=on
 BOARD_KERNEL_CMDLINE += swiotlb=1024
+BOARD_KERNEL_CMDLINE += cgroup.memory=nokmem
 BOARD_KERNEL_CMDLINE += disable_dma32=on
 BOARD_BOOTCONFIG += androidboot.boot_devices=14700000.ufs
 
@@ -267,6 +269,8 @@ BOARD_USES_EXYNOS_AFBC_FEATURE := true
 
 BOARD_LIBACRYL_DEFAULT_COMPOSITOR := fimg2d_gs201
 BOARD_LIBACRYL_G2D_HDR_PLUGIN := libacryl_hdr_plugin
+$(call soong_config_set,acryl,libacryl_g2d_hdr_plugin,//hardware/google/graphics/gs201/libacryl_plugins:libacryl_hdr_plugin)
+$(call soong_config_set,acryl,libacryl_c_include,hardware/google/graphics/$(TARGET_BOARD_PLATFORM)/libcap)
 
 # HWCServices
 BOARD_USES_HWC_SERVICES := true
diff --git a/conf/init.debug.rc b/conf/init.debug.rc
index 3f8be42f..eb970541 100644
--- a/conf/init.debug.rc
+++ b/conf/init.debug.rc
@@ -15,6 +15,15 @@ on init
     chown system system /sys/devices/platform/sjtag_gsa/interface/end
     chown system system /sys/devices/platform/sjtag_gsa/interface/pubkey
 
+# HSUM separated main user from the SYSTEM user, granting write permissions
+# for write only SJTAG sysfs files
+    chmod 220 /sys/devices/platform/sjtag_ap/interface/auth
+    chmod 220 /sys/devices/platform/sjtag_ap/interface/begin
+    chmod 220 /sys/devices/platform/sjtag_ap/interface/end
+    chmod 220 /sys/devices/platform/sjtag_gsa/interface/auth
+    chmod 220 /sys/devices/platform/sjtag_gsa/interface/begin
+    chmod 220 /sys/devices/platform/sjtag_gsa/interface/end
+
 on property:vendor.debug.ramdump.force_crash=true
     write /sys/kernel/pixel_debug/trigger "null"
 
diff --git a/default-permissions.xml b/default-permissions.xml
index afe5bc4d..45a2d303 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -180,7 +180,7 @@
     </exception>
 
     <exception package="com.google.android.apps.pixel.relationships">
-        <!-- Contacts -->
+        <permission name="android.permission.CALL_PHONE" fixed="false"/>
         <permission name="android.permission.READ_CALL_LOG" fixed="false"/>
         <permission name="android.permission.READ_CONTACTS" fixed="false"/>
         <permission name="android.permission.WRITE_CONTACTS" fixed="false"/>
diff --git a/device.mk b/device.mk
index d20b5520..fd0eccfb 100644
--- a/device.mk
+++ b/device.mk
@@ -959,9 +959,6 @@ USE_EARLY_SEND_DEVICE_INFO := true
 ifneq ($(BOARD_WITHOUT_RADIO),true)
 $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/common/device-vendor.mk)
 
-# modem_svc_sit daemon
-PRODUCT_PACKAGES += modem_svc_sit
-
 # modem logging binary/configs
 PRODUCT_PACKAGES += modem_logging_control
 
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index d266ccd3..21bc5321 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -284,6 +284,9 @@
     <!-- Enable Zram writeback feature to allow unused pages in zram be written to flash. -->
     <bool name="config_zramWriteback">true</bool>
 
+    <!-- the number of the max cached processes in the system. -->
+    <integer name="config_customizedMaxCachedProcesses">1024</integer>
+
     <!-- 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
diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp
index 5b38729b..530abb8c 100644
--- a/usb/usb/Usb.cpp
+++ b/usb/usb/Usb.cpp
@@ -990,17 +990,21 @@ void queryVersionHelper(android::hardware::usb::Usb *usb,
     Status status;
     pthread_mutex_lock(&usb->mLock);
     status = getPortStatusHelper(usb, currentPortStatus);
-    queryMoistureDetectionStatus(usb, currentPortStatus);
-    queryPowerTransferStatus(usb, currentPortStatus);
-    queryNonCompliantChargerStatus(currentPortStatus);
-    queryUsbDataSession(usb, currentPortStatus);
-    if (usb->mCallback != NULL) {
-        ScopedAStatus ret = usb->mCallback->notifyPortStatusChange(*currentPortStatus,
-            status);
-        if (!ret.isOk())
-            ALOGE("queryPortStatus error %s", ret.getDescription().c_str());
+    if (status == Status::SUCCESS && currentPortStatus->size() > 0) {
+        queryMoistureDetectionStatus(usb, currentPortStatus);
+        queryPowerTransferStatus(usb, currentPortStatus);
+        queryNonCompliantChargerStatus(currentPortStatus);
+        queryUsbDataSession(usb, currentPortStatus);
+        if (usb->mCallback != NULL) {
+            ScopedAStatus ret = usb->mCallback->notifyPortStatusChange(*currentPortStatus,
+                status);
+            if (!ret.isOk())
+                ALOGE("queryPortStatus error %s", ret.getDescription().c_str());
+        } else {
+            ALOGI("Notifying userspace skipped. Callback is NULL");
+        }
     } else {
-        ALOGI("Notifying userspace skipped. Callback is NULL");
+        ALOGI("%s skipped. currentPortStatus is empty", __func__);
     }
     pthread_mutex_unlock(&usb->mLock);
 }