diff --git a/device-tegu.mk b/device-tegu.mk
index 82d2c93..71ffe36 100644
--- a/device-tegu.mk
+++ b/device-tegu.mk
@@ -58,6 +58,7 @@ include device/google/gs-common/touch/gti/predump_gti.mk
 include device/google/gs-common/touch/syna/predump_syna20.mk
 include device/google/gs-common/gril/aidl/2.0/gril_aidl.mk
 include device/google/gs-common/esim/esim.mk
+include device/google/gs-common/pixelsupport/pixelsupport.mk
 
 # go/lyric-soong-variables
 $(call soong_config_set,lyric,camera_hardware,tegu)
@@ -415,3 +416,7 @@ PRODUCT_COPY_FILES += \
 
 PRODUCT_COPY_FILES += \
     device/google/tegu/bluetooth/audio_set_configurations.json:$(TARGET_COPY_OUT_VENDOR)/etc/aidl/le_audio/aidl_audio_set_configurations.json
+
+#Component Override for Pixel Troubleshooting App
+PRODUCT_COPY_FILES += \
+    device/google/tegu/tegu-component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/tegu-component-overrides.xml
diff --git a/tegu-component-overrides.xml b/tegu-component-overrides.xml
new file mode 100644
index 0000000..74a87c5
--- /dev/null
+++ b/tegu-component-overrides.xml
@@ -0,0 +1,21 @@
+<?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 class="com.google.android.apps.pixel.support.navigationroot.TouchDiagnosticsSearchProvider" enabled="true" />
+    </component-override>
+</config>
\ No newline at end of file