diff --git a/board-info.txt b/board-info.txt
index b06c65a..90cc197 100644
--- a/board-info.txt
+++ b/board-info.txt
@@ -1 +1,2 @@
 require board=cloudripper|ravenclaw|cheetah|panther
+require partition-exists=vendor_kernel_boot
diff --git a/cheetah/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml b/cheetah/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml
new file mode 100644
index 0000000..25ffdf0
--- /dev/null
+++ b/cheetah/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- These resources are around just to allow their values to be customized
+     for different hardware and product builds. -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- set this to ./DevInfo/Mod -->
+    <string translatable="false" name="config_devinfo_model">GE2AE</string>
+</resources>
+
diff --git a/device-cheetah.mk b/device-cheetah.mk
index e806bc8..b15b03c 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -22,6 +22,7 @@ $(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-v
 $(call inherit-product-if-exists, vendor/google_devices/gs201/proprietary/device-vendor.mk)
 $(call inherit-product-if-exists, vendor/google_devices/pantah/proprietary/cheetah/device-vendor-cheetah.mk)
 $(call inherit-product-if-exists, vendor/google_devices/cheetah/proprietary/device-vendor.mk)
+$(call inherit-product-if-exists, vendor/google_devices/pantah/proprietary/WallpapersCheetah.mk)
 
 DEVICE_PACKAGE_OVERLAYS += device/google/pantah/cheetah/overlay
 
@@ -275,3 +276,12 @@ PRODUCT_VENDOR_PROPERTIES += \
 # Bluetooth AAC VBR
 PRODUCT_PRODUCT_PROPERTIES += \
     persist.bluetooth.a2dp_aac.vbr_supported=true
+
+# Override BQR mask to enable LE Audio Choppy report
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_PRODUCT_PROPERTIES += \
+    persist.bluetooth.bqr.event_mask=262238
+else
+PRODUCT_PRODUCT_PROPERTIES += \
+    persist.bluetooth.bqr.event_mask=94
+endif
diff --git a/device-panther.mk b/device-panther.mk
index c34458c..9fd7289 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -22,6 +22,7 @@ $(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-v
 $(call inherit-product-if-exists, vendor/google_devices/gs201/proprietary/device-vendor.mk)
 $(call inherit-product-if-exists, vendor/google_devices/pantah/proprietary/panther/device-vendor-panther.mk)
 $(call inherit-product-if-exists, vendor/google_devices/panther/proprietary/device-vendor.mk)
+$(call inherit-product-if-exists, vendor/google_devices/pantah/proprietary/WallpapersPanther.mk)
 
 DEVICE_PACKAGE_OVERLAYS += device/google/pantah/panther/overlay
 
@@ -262,3 +263,12 @@ PRODUCT_VENDOR_PROPERTIES += \
 # Bluetooth AAC VBR
 PRODUCT_PRODUCT_PROPERTIES += \
     persist.bluetooth.a2dp_aac.vbr_supported=true
+
+# Override BQR mask to enable LE Audio Choppy report
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_PRODUCT_PROPERTIES += \
+    persist.bluetooth.bqr.event_mask=262238
+else
+PRODUCT_PRODUCT_PROPERTIES += \
+    persist.bluetooth.bqr.event_mask=94
+endif
diff --git a/panther/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml b/panther/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml
new file mode 100644
index 0000000..d673d92
--- /dev/null
+++ b/panther/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- These resources are around just to allow their values to be customized
+     for different hardware and product builds. -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- set this to ./DevInfo/Mod -->
+    <string translatable="false" name="config_devinfo_model">GQML3</string>
+</resources>