diff --git a/device-lynx.mk b/device-lynx.mk
index 408a4f2..5803dfd 100644
--- a/device-lynx.mk
+++ b/device-lynx.mk
@@ -340,8 +340,9 @@ PRODUCT_PRODUCT_PROPERTIES += \
     ro.quick_start.device_id=lynx
 
 # Bluetooth device id
+# Raven: 0x410B
 PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.device_id.product_id=20491
+    bluetooth.device_id.product_id=16651
 
 # ETM
 ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
diff --git a/lynx/BoardConfig.mk b/lynx/BoardConfig.mk
index cebad5f..9b10eb1 100644
--- a/lynx/BoardConfig.mk
+++ b/lynx/BoardConfig.mk
@@ -40,6 +40,7 @@ BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1
 
 include device/google/gs201/BoardConfig-common.mk
 -include vendor/google_devices/gs201/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
 -include vendor/google_devices/lynx/proprietary/BoardConfigVendor.mk
 include device/google/lynx-sepolicy/lynx-sepolicy.mk
 include device/google/gs201/wifi/qcom/BoardConfig-wifi.mk