diff --git a/usb/usb/Android.bp b/usb/usb/Android.bp
index f0f50698..7d42a76b 100644
--- a/usb/usb/Android.bp
+++ b/usb/usb/Android.bp
@@ -42,8 +42,8 @@ cc_binary {
         "libhardware",
         "android.hardware.thermal@1.0",
         "android.hardware.thermal@2.0",
-	"android.hardware.usb.gadget@1.0",
-	"android.hardware.usb-V1-ndk",
+        "android.hardware.usb.gadget@1.0",
+        "android.hardware.usb-V2-ndk",
         "libcutils",
         "android.frameworks.stats-V1-ndk",
         "pixelatoms-cpp",
diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp
index d3c5036a..f69dca53 100644
--- a/usb/usb/Usb.cpp
+++ b/usb/usb/Usb.cpp
@@ -44,6 +44,7 @@
 
 using aidl::android::frameworks::stats::IStats;
 using android::base::GetProperty;
+using android::base::Tokenize;
 using android::base::Trim;
 using android::hardware::google::pixel::getStatsService;
 using android::hardware::google::pixel::PixelAtoms::VendorUsbPortOverheat;
@@ -59,6 +60,11 @@ volatile bool destroyThread;
 string enabledPath;
 constexpr char kHsi2cPath[] = "/sys/devices/platform/10d50000.hsi2c";
 constexpr char kI2CPath[] = "/sys/devices/platform/10d50000.hsi2c/i2c-";
+constexpr char kComplianceWarningsPath[] = "device/non_compliant_reasons";
+constexpr char kComplianceWarningBC12[] = "bc12";
+constexpr char kComplianceWarningDebugAccessory[] = "debug-accessory";
+constexpr char kComplianceWarningMissingRp[] = "missing_rp";
+constexpr char kComplianceWarningOther[] = "other";
 constexpr char kContaminantDetectionPath[] = "i2c-max77759tcpc/contaminant_detection";
 constexpr char kStatusPath[] = "i2c-max77759tcpc/contaminant_detection_status";
 constexpr char kSinkLimitEnable[] = "i2c-max77759tcpc/usb_limit_sink_enable";
@@ -275,6 +281,42 @@ Status queryMoistureDetectionStatus(std::vector<PortStatus> *currentPortStatus)
     return Status::SUCCESS;
 }
 
+Status queryNonCompliantChargerStatus(std::vector<PortStatus> *currentPortStatus) {
+    string reasons, path;
+
+    for (int i = 0; i < currentPortStatus->size(); i++) {
+        (*currentPortStatus)[i].supportsComplianceWarnings = true;
+        path = string(kTypecPath) + "/" + (*currentPortStatus)[i].portName + "/" +
+                string(kComplianceWarningsPath);
+        if (ReadFileToString(path.c_str(), &reasons)) {
+            std::vector<string> reasonsList = Tokenize(reasons.c_str(), "[], \n\0");
+            for (string reason : reasonsList) {
+                if (!strncmp(reason.c_str(), kComplianceWarningDebugAccessory,
+                            strlen(kComplianceWarningDebugAccessory))) {
+                    (*currentPortStatus)[i].complianceWarnings.push_back(ComplianceWarning::DEBUG_ACCESSORY);
+                    continue;
+                }
+                if (!strncmp(reason.c_str(), kComplianceWarningBC12,
+                            strlen(kComplianceWarningBC12))) {
+                    (*currentPortStatus)[i].complianceWarnings.push_back(ComplianceWarning::BC_1_2);
+                    continue;
+                }
+                if (!strncmp(reason.c_str(), kComplianceWarningMissingRp,
+                            strlen(kComplianceWarningMissingRp))) {
+                    (*currentPortStatus)[i].complianceWarnings.push_back(ComplianceWarning::MISSING_RP);
+                    continue;
+                }
+                if (!strncmp(reason.c_str(), kComplianceWarningOther,
+                            strlen(kComplianceWarningOther))) {
+                    (*currentPortStatus)[i].complianceWarnings.push_back(ComplianceWarning::OTHER);
+                    continue;
+                }
+            }
+        }
+    }
+    return Status::SUCCESS;
+}
+
 string appendRoleNodeHelper(const string &portName, PortRole::Tag tag) {
     string node("/sys/class/typec/" + portName);
 
@@ -771,6 +813,7 @@ void queryVersionHelper(android::hardware::usb::Usb *usb,
     status = getPortStatusHelper(usb, currentPortStatus);
     queryMoistureDetectionStatus(currentPortStatus);
     queryPowerTransferStatus(currentPortStatus);
+    queryNonCompliantChargerStatus(currentPortStatus);
     if (usb->mCallback != NULL) {
         ScopedAStatus ret = usb->mCallback->notifyPortStatusChange(*currentPortStatus,
             status);
diff --git a/usb/usb/android.hardware.usb-service.xml b/usb/usb/android.hardware.usb-service.xml
index 60881948..c3f07f52 100644
--- a/usb/usb/android.hardware.usb-service.xml
+++ b/usb/usb/android.hardware.usb-service.xml
@@ -1,7 +1,7 @@
 <manifest version="1.0" type="device">
     <hal format="aidl">
         <name>android.hardware.usb</name>
-        <version>1</version>
+        <version>2</version>
         <interface>
             <name>IUsb</name>
             <instance>default</instance>