diff --git a/Android.bp b/Android.bp
index ef1e4b44..bf7fac7e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -34,3 +34,10 @@ license {
         "NOTICE",
     ],
 }
+
+sh_binary {
+    name: "disable_contaminant_detection.sh",
+    src: "disable_contaminant_detection.sh",
+    vendor: true,
+    sub_dir: "hw",
+}
diff --git a/conf/init.zuma.rc b/conf/init.zuma.rc
index e5e199d5..0d7a66e8 100644
--- a/conf/init.zuma.rc
+++ b/conf/init.zuma.rc
@@ -790,6 +790,12 @@ on property:sys.boot_completed=1
     # Set bg group throttle
     write /proc/vendor_sched/ug_bg_group_throttle 308
 
+    # Set uclamp.max for some groups, which could indicate cpu importance used in scheduling
+    write /proc/vendor_sched/bg_uclamp_max 512
+    write /proc/vendor_sched/sysbg_uclamp_max 512
+    write /proc/vendor_sched/ota_uclamp_max 512
+    write /proc/vendor_sched/dex2oat_uclamp_max 615
+
     # Set PMU freq limit parameters
     write /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/lcpi_threshold 2
     write /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold 59
diff --git a/conf/init.zuma.usb.rc b/conf/init.zuma.usb.rc
index d8925eaa..b6bf02d8 100644
--- a/conf/init.zuma.usb.rc
+++ b/conf/init.zuma.usb.rc
@@ -195,6 +195,9 @@ on property:sys.usb.config=charger && property:sys.usb.configfs=1
 on property:ro.bootmode=usbuwb
     setprop persist.vendor.usb.usbradio.config uwb_acm
 
+on property:vendor.usb.contaminantdisable=true
+    exec /vendor/bin/hw/disable_contaminant_detection.sh
+
 on property:persist.vendor.usb.displayport.enabled=1
     write /sys/class/typec/port0/port0.0/mode1/active "yes"
 
diff --git a/device.mk b/device.mk
index 7dd7fb1f..11a589e5 100644
--- a/device.mk
+++ b/device.mk
@@ -359,6 +359,10 @@ PRODUCT_COPY_FILES += \
 	device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.persist:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.persist \
 	device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.modem:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.modem
 
+# Shell scripts
+PRODUCT_PACKAGES += \
+	disable_contaminant_detection.sh
+
 include device/google/gs-common/insmod/insmod.mk
 
 # Insmod config files
diff --git a/disable_contaminant_detection.sh b/disable_contaminant_detection.sh
new file mode 100644
index 00000000..07149643
--- /dev/null
+++ b/disable_contaminant_detection.sh
@@ -0,0 +1,7 @@
+#!/vendor/bin/sh
+
+for f in /sys/devices/platform/10cb0000.hsi2c/i2c-*/*-0025; do
+  if [ -d $f ]; then
+    echo 0 > $f/contaminant_detection;
+  fi
+done