diff --git a/device-common.mk b/device-common.mk
index 7047dcb..54f10aa 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -112,7 +112,6 @@
 # TODO(b/34258263): will marlin/sailfish be binderized devices?
 PRODUCT_PACKAGES += \
     android.hardware.audio@2.0-service \
-    android.hardware.boot@1.0-service \
     android.hardware.light@2.0-service \
     android.hardware.memtrack@1.0-service \
     android.hardware.nfc@1.0-service \
@@ -489,6 +488,11 @@
 PRODUCT_PACKAGES += \
     android.hardware.boot@1.0-impl \
 
+ifeq ($(ENABLE_TREBLE), true)
+PRODUCT_PACKAGES += \
+    android.hardware.boot@1.0-service
+endif
+
 # Library used for VTS tests  (only for userdebug and eng builds)
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 # Test HAL for hwbinder performance benchamrk.
diff --git a/vintf.xml b/vintf.xml
index 93e7667..e6c2442 100644
--- a/vintf.xml
+++ b/vintf.xml
@@ -25,7 +25,7 @@
     </hal>
     <hal format="hidl">
         <name>android.hardware.boot</name>
-        <transport>toggled</transport>
+        <transport>passthrough</transport>
         <impl level="generic"></impl>
         <version>1.0</version>
     </hal>