diff --git a/common.mk b/common.mk
index 6412a5b..05be1c2 100644
--- a/common.mk
+++ b/common.mk
@@ -239,7 +239,8 @@ PRODUCT_PACKAGES += \
 
 # Component overrides
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides.xml
+    $(LOCAL_PATH)/configs/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides.xml \
+    $(LOCAL_PATH)/configs/component-overrides_qti.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/component-overrides.xml
 
 # Display
 PRODUCT_PACKAGES += \
diff --git a/configs/component-overrides.xml b/configs/component-overrides.xml
index 99c2115..497f86d 100644
--- a/configs/component-overrides.xml
+++ b/configs/component-overrides.xml
@@ -15,8 +15,6 @@
 -->
 <config>
     <component-override package="com.android.bluetooth" >
-        <component class=".avrcpcontroller.AvrcpControllerService" enabled="true" />
-        <component class=".hid.HidDeviceService" enabled="true" />
         <component class=".sap.SapService" enabled="true" />
     </component-override>
 </config>
diff --git a/configs/component-overrides_qti.xml b/configs/component-overrides_qti.xml
new file mode 100644
index 0000000..c684db5
--- /dev/null
+++ b/configs/component-overrides_qti.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<config>
+    <component-override package="com.android.bluetooth" >
+        <component class=".avrcpcontroller.AvrcpControllerService" enabled="true" />
+        <component class=".hid.HidDeviceService" enabled="true" />
+    </component-override>
+</config>