diff --git a/conf/init.oriole.rc b/conf/init.oriole.rc
index 8425b5a..c3e6976 100644
--- a/conf/init.oriole.rc
+++ b/conf/init.oriole.rc
@@ -31,6 +31,10 @@ on fs
     # Start the twoshay touch service
     start twoshay
 
+    # LHBM
+    # 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
+
 # Toggle glove_mode according to touch_sensitivity_mode
 on property:persist.vendor.touch_sensitivity_mode=0 && property:sys.boot_completed=1
     write /sys/class/spi_master/spi11/spi11.0/glove_mode 00
diff --git a/conf/init.raven.rc b/conf/init.raven.rc
index e7ba699..5f6088b 100644
--- a/conf/init.raven.rc
+++ b/conf/init.raven.rc
@@ -31,6 +31,10 @@ on fs
     # Face
     exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/faceauth.app
 
+    # LHBM
+    # 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
+
 on property:mfgapi.touchpanel.permission=1
     chmod 0600 /sys/devices/virtual/sec/tsp/cmd
     chown system system /sys/devices/virtual/sec/tsp/cmd
diff --git a/device-oriole.mk b/device-oriole.mk
index 1a7291d..1972b03 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -26,6 +26,7 @@ $(call inherit-product-if-exists, vendor/google/camera/devices/raviole/oriole/de
 DEVICE_PACKAGE_OVERLAYS += device/google/raviole/oriole/overlay
 
 include device/google/gs101/device-shipping-common.mk
+include device/google/gs101/fingerprint/udfps.mk
 include device/google/raviole/audio/oriole/audio-tables.mk
 include hardware/google/pixel/vibrator/cs40l25/device.mk
 
diff --git a/device-raven.mk b/device-raven.mk
index f01b71e..b5b8746 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -26,6 +26,7 @@ $(call inherit-product-if-exists, vendor/google/camera/devices/raviole/raven/dev
 DEVICE_PACKAGE_OVERLAYS += device/google/raviole/raven/overlay
 
 include device/google/gs101/device-shipping-common.mk
+include device/google/gs101/fingerprint/udfps.mk
 ifeq ($(filter factory_raven, $(TARGET_PRODUCT)),)
 include device/google/gs101/uwb/uwb.mk
 endif
@@ -33,6 +34,7 @@ include device/google/raviole/audio/raven/audio-tables.mk
 include hardware/google/pixel/vibrator/cs40l25/device.mk
 
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.support_kernel_idle_timer=true
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.enable_frame_rate_override=true
 
 # Init files
 PRODUCT_COPY_FILES += \