diff --git a/caiman/caiman-component-overrides.xml b/caiman/caiman-component-overrides.xml
new file mode 100644
index 00000000..04cfc9ed
--- /dev/null
+++ b/caiman/caiman-component-overrides.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2024 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.google.android.apps.pixel.support" >
+        <component class="com.google.android.apps.pixel.support.navigationroot.TouchNavigationRootActivity" enabled="true" />
+    </component-override>
+</config>
diff --git a/device-caiman.mk b/device-caiman.mk
index e0031eaf..999cb551 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -405,3 +405,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
 # Connectivity Resources Overlay
 PRODUCT_PACKAGES += \
     ConnectivityResourcesOverlayCaimitoOverride
+
+#Component Override for Pixel Troubleshooting App
+PRODUCT_COPY_FILES += \
+    device/google/caimito/caiman/caiman-component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/caiman-component-overrides.xml
diff --git a/device-komodo.mk b/device-komodo.mk
index a6f393d6..31dd79ab 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -401,3 +401,7 @@ endif
 # Connectivity Resources Overlay
 PRODUCT_PACKAGES += \
     ConnectivityResourcesOverlayCaimitoOverride
+
+#Component Override for Pixel Troubleshooting App
+PRODUCT_COPY_FILES += \
+    device/google/caimito/komodo/komodo-component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/komodo-component-overrides.xml
diff --git a/device-tokay.mk b/device-tokay.mk
index b32dbdd5..29da70f4 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -364,3 +364,8 @@ endif
 # Connectivity Resources Overlay
 PRODUCT_PACKAGES += \
     ConnectivityResourcesOverlayCaimitoOverride
+
+#Component Override for Pixel Troubleshooting App
+PRODUCT_COPY_FILES += \
+    device/google/caimito/tokay/tokay-component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/tokay-component-overrides.xml
+
diff --git a/komodo/komodo-component-overrides.xml b/komodo/komodo-component-overrides.xml
new file mode 100644
index 00000000..04cfc9ed
--- /dev/null
+++ b/komodo/komodo-component-overrides.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2024 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.google.android.apps.pixel.support" >
+        <component class="com.google.android.apps.pixel.support.navigationroot.TouchNavigationRootActivity" enabled="true" />
+    </component-override>
+</config>
diff --git a/tokay/tokay-component-overrides.xml b/tokay/tokay-component-overrides.xml
new file mode 100644
index 00000000..04cfc9ed
--- /dev/null
+++ b/tokay/tokay-component-overrides.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2024 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.google.android.apps.pixel.support" >
+        <component class="com.google.android.apps.pixel.support.navigationroot.TouchNavigationRootActivity" enabled="true" />
+    </component-override>
+</config>