diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc
index a0ed69ee..3ffaad9b 100644
--- a/conf/init.gs101.rc
+++ b/conf/init.gs101.rc
@@ -749,15 +749,13 @@ on property:sys.boot_completed=1
 
     # Set ug group
     write /proc/vendor_sched/bg_ug 0
-    write /proc/vendor_sched/sys_ug 0
+    write /proc/vendor_sched/sysbg_ug 0
     write /proc/vendor_sched/ota_ug 0
     write /proc/vendor_sched/dex2oat_ug 1
     write /proc/vendor_sched/ta_ug 1
 
     # Set bg group throttle
     write /proc/vendor_sched/ug_bg_group_throttle 308
-    # TODO: remove this one after all kernel prebuilts are merged
-    write /proc/vendor_sched/vug_bg_group_throttle 308
 
     # Set PMU freq limit parameters
     write /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/lcpi_threshold 2
diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp
index 7378fc11..6993275a 100644
--- a/usb/usb/Usb.cpp
+++ b/usb/usb/Usb.cpp
@@ -312,7 +312,8 @@ Status queryNonCompliantChargerStatus(std::vector<PortStatus> *currentPortStatus
                     continue;
                 }
             }
-            if ((*currentPortStatus)[i].complianceWarnings.size() > 0) {
+            if ((*currentPortStatus)[i].complianceWarnings.size() > 0 &&
+                 (*currentPortStatus)[i].currentPowerRole == PortPowerRole::NONE) {
                 (*currentPortStatus)[i].currentMode = PortMode::UFP;
                 (*currentPortStatus)[i].currentPowerRole = PortPowerRole::SINK;
                 (*currentPortStatus)[i].currentDataRole = PortDataRole::NONE;
@@ -819,9 +820,7 @@ void queryVersionHelper(android::hardware::usb::Usb *usb,
     status = getPortStatusHelper(usb, currentPortStatus);
     queryMoistureDetectionStatus(currentPortStatus);
     queryPowerTransferStatus(currentPortStatus);
-#if 0 /* b/278018111 disable compliance warning; revert it after fixing the issue */
     queryNonCompliantChargerStatus(currentPortStatus);
-#endif
     if (usb->mCallback != NULL) {
         ScopedAStatus ret = usb->mCallback->notifyPortStatusChange(*currentPortStatus,
             status);