diff --git a/universal7885-common/configs/sysconfig/component-overrides.xml b/universal7885-common/configs/sysconfig/component-overrides.xml
new file mode 100644
index 0000000..99c2115
--- /dev/null
+++ b/universal7885-common/configs/sysconfig/component-overrides.xml
@@ -0,0 +1,22 @@
+<?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 class=".sap.SapService" enabled="true" />
+    </component-override>
+</config>
diff --git a/universal7885-common/configs/pixel/pixel_eureka.xml b/universal7885-common/configs/sysconfig/pixel_eureka.xml
similarity index 100%
rename from universal7885-common/configs/pixel/pixel_eureka.xml
rename to universal7885-common/configs/sysconfig/pixel_eureka.xml
diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk
index d48c6a1..1ee2ec7 100644
--- a/universal7885-common/universal7885-common.mk
+++ b/universal7885-common/universal7885-common.mk
@@ -174,10 +174,6 @@ PRODUCT_COPY_FILES += \
 DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
 DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay-derp
 
-# Google Photos
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/pixel/pixel_eureka.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/pixel_eureka.xml
-
 # Permissions
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.audio.low_latency.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.low_latency.xml \
@@ -287,6 +283,12 @@ PRODUCT_SOONG_NAMESPACES += \
     hardware/google/pixel \
     device/samsung/universal7885-common/aidl/power-libperfmgr
 
+# Sysconfig
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/configs/sysconfig/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides-bt.xml \
+    $(LOCAL_PATH)/configs/sysconfig/pixel_eureka.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/pixel_eureka.xml
+
+
 # Thermal HAL
 PRODUCT_PACKAGES += \
     android.hardware.thermal@2.0-service.pixel \