diff --git a/conf/init.raven.rc b/conf/init.raven.rc
index 58a219e..b468737 100644
--- a/conf/init.raven.rc
+++ b/conf/init.raven.rc
@@ -38,6 +38,9 @@ on fs
     # FIXME(b/183223359): Only grant write access to SystemUI.
     chmod 0666 /sys/class/drm/card0/card0-DSI-1/panel/backlight/panel0-backlight/local_hbm_mode
 
+    # Start the twoshay touch service
+    start twoshay
+
 on property:ro.revision=PROTO1.0
     setprop persist.fingerprint.ghbm true
 
diff --git a/device-oriole.mk b/device-oriole.mk
index 6476916..c2754e7 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -95,3 +95,9 @@ PRODUCT_PRODUCT_PROPERTIES += ro.com.google.ime.kb_pad_port_b=10
 
 # Display LBE
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1
+
+# userdebug specific
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+    PRODUCT_COPY_FILES += \
+        device/google/gs101/init.hardware.wlc.rc.userdebug:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.$(PRODUCT_PLATFORM).wlc.rc
+endif
diff --git a/device-raven.mk b/device-raven.mk
index e9af790..fedff0b 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -93,3 +93,9 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1
 
 # PowerStats HAL
 PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/raven
+
+# userdebug specific
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+    PRODUCT_COPY_FILES += \
+        device/google/gs101/init.hardware.wlc.rc.userdebug:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.$(PRODUCT_PLATFORM).wlc.rc
+endif