diff --git a/BoardConfig.mk b/BoardConfig.mk
index ad04966..2dd594f 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -94,3 +94,7 @@ BOARD_LISA_TARGET_SCRIPTS := device/google/wahoo/lisa/
 # Rounded corners recovery UI. 105px = 30dp * 3.5 density, where 30dp comes from
 # rounded_corner_radius in overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml.
 TARGET_RECOVERY_UI_MARGIN_HEIGHT := 105
+
+# VTS DTBO Verification. This kernel cmdline parameter should be added by the bootloader
+# for all future devices.
+BOARD_KERNEL_CMDLINE += androidboot.dtbo_idx=12
diff --git a/device.mk b/device.mk
index 4861d07..09129d0 100644
--- a/device.mk
+++ b/device.mk
@@ -133,6 +133,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
     ro.hwui.path_cache_size=32
 
 # Enable Perfetto traced
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     persist.traced.enable=1