diff --git a/device.mk b/device.mk
index 3d4e702..de42a88 100644
--- a/device.mk
+++ b/device.mk
@@ -79,6 +79,9 @@ PRODUCT_PACKAGES += \
     android.hidl.base@1.0 \
     libhidltransport
 
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/vendor_override_manifest.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/vendor_override_manifest.xml
+
 # IMS
 PRODUCT_PACKAGES += \
     ims-ext-common \
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 2534709..c2ae61d 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -46,6 +46,7 @@ on init
     mount none /system/etc/wifi/WCNSS_qcom_cfg.ini  /vendor/etc/wifi/WCNSS_qcom_cfg.ini  bind
     mount none /system/etc/init/android.hardware.light@2.0-service.rc  /vendor/etc/init/android.hardware.light@2.0-service.rc  bind
     mount none /vendor/lost+found /vendor/overlay bind
+    mount none /system/etc/vendor_override_manifest.xml /vendor/etc/vintf/manifest/android.hardware.atrace@1.0-service.xml bind
 
     # set default schedTune value for foreground/top-app
     # Set default values for foreground and top-app stune
diff --git a/vendor_override_manifest.xml b/vendor_override_manifest.xml
new file mode 100644
index 0000000..60a4c35
--- /dev/null
+++ b/vendor_override_manifest.xml
@@ -0,0 +1,19 @@
+<manifest version="1.0" type="device">
+    <hal format="hidl">
+        <name>android.hardware.atrace</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IAtraceDevice</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" override="true">
+        <name>android.hardware.power</name>
+        <transport>hwbinder</transport>
+    </hal>
+    <hal format="hidl" override="true">
+        <name>vendor.qti.hardware.perf</name>
+        <transport>hwbinder</transport>
+    </hal>
+</manifest>