diff --git a/device.mk b/device.mk
index 67829a45..585fe97a 100644
--- a/device.mk
+++ b/device.mk
@@ -1026,6 +1026,12 @@ PRODUCT_SOONG_NAMESPACES += \
 
 $(call soong_config_set,aoc_audio_board,platform,$(TARGET_BOARD_PLATFORM))
 
+## AoC soong
+PRODUCT_SOONG_NAMESPACES += \
+        vendor/google/whitechapel/aoc
+
+$(call soong_config_set,aoc,target_soc,$(TARGET_BOARD_PLATFORM))
+
 $(call soong_config_set,android_hardware_audio,run_64bit,true)
 
 # Audio properties
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 1bf07ef0..2ab14967 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -128,7 +128,7 @@
     </hal>
     <hal format="hidl" optional="true">
         <name>vendor.google.google_battery</name>
-        <version>1.1</version>
+        <version>1.2</version>
         <interface>
             <name>IGoogleBattery</name>
             <instance>default</instance>
diff --git a/manifest.xml b/manifest.xml
index 7b78da9a..02ed2c9f 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -154,7 +154,7 @@
     <hal format="hidl">
       <name>vendor.google.google_battery</name>
       <transport>hwbinder</transport>
-      <version>1.1</version>
+      <version>1.2</version>
       <interface>
         <name>IGoogleBattery</name>
         <instance>default</instance>
diff --git a/manifest_64.xml b/manifest_64.xml
index 17b08d04..e3b0d2af 100644
--- a/manifest_64.xml
+++ b/manifest_64.xml
@@ -155,7 +155,7 @@
     <hal format="hidl">
       <name>vendor.google.google_battery</name>
       <transport>hwbinder</transport>
-      <version>1.1</version>
+      <version>1.2</version>
       <interface>
         <name>IGoogleBattery</name>
         <instance>default</instance>
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 2ab8e4e4..51b1ad42 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -227,7 +227,6 @@
     <string-array translatable="false" name="config_defaultPinnerServiceFiles">
         <item>"/apex/com.android.art/javalib/core-oj.jar"</item>
         <item>"/apex/com.android.art/javalib/core-libart.jar"</item>
-        <item>"/apex/com.android.media/javalib/updatable-media.jar"</item>
         <item>"/system/framework/framework.jar"</item>
         <item>"/system/framework/services.jar"</item>
         <item>"/system/bin/surfaceflinger"</item>
diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp
index 32cc9c97..ba2d5b1c 100644
--- a/usb/usb/Usb.cpp
+++ b/usb/usb/Usb.cpp
@@ -172,6 +172,31 @@ ScopedAStatus Usb::enableUsbDataWhileDocked(const string& in_portName,
     return ScopedAStatus::ok();
 }
 
+ScopedAStatus Usb::resetUsbPort(const std::string& in_portName, int64_t in_transactionId) {
+    bool result = true;
+    std::vector<PortStatus> currentPortStatus;
+
+    ALOGI("Userspace reset USB Port. opID:%ld", in_transactionId);
+
+    if (!WriteStringToFile("none", PULLUP_PATH)) {
+        ALOGI("Gadget cannot be pulled down");
+        result = false;
+    }
+
+    pthread_mutex_lock(&mLock);
+    if (mCallback != NULL) {
+        ::ndk::ScopedAStatus ret = mCallback->notifyResetUsbPortStatus(
+            in_portName, result ? Status::SUCCESS : Status::ERROR, in_transactionId);
+        if (!ret.isOk())
+            ALOGE("notifyTransactionStatus error %s", ret.getDescription().c_str());
+    } else {
+        ALOGE("Not notifying the userspace. Callback is not set");
+    }
+    pthread_mutex_unlock(&mLock);
+
+    return ::ndk::ScopedAStatus::ok();
+}
+
 Status getI2cBusHelper(string *name) {
     DIR *dp;
 
diff --git a/usb/usb/Usb.h b/usb/usb/Usb.h
index 35b6cb58..1a93e191 100644
--- a/usb/usb/Usb.h
+++ b/usb/usb/Usb.h
@@ -69,6 +69,7 @@ struct Usb : public BnUsb {
             int64_t in_transactionId) override;
     ScopedAStatus limitPowerTransfer(const string& in_portName, bool in_limit,
         int64_t in_transactionId) override;
+    ScopedAStatus resetUsbPort(const string& in_portName, int64_t in_transactionId) override;
 
     std::shared_ptr<::aidl::android::hardware::usb::IUsbCallback> mCallback;
     // Protects mCallback variable