diff --git a/bluejay/rro_overlays/HbmSVManagerOverlay/Android.bp b/bluejay/rro_overlays/HbmSVManagerOverlay/Android.bp
new file mode 100644
index 0000000..5ca5189
--- /dev/null
+++ b/bluejay/rro_overlays/HbmSVManagerOverlay/Android.bp
@@ -0,0 +1,8 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "HbmSVManagerOverlay",
+    vendor: true
+}
diff --git a/bluejay/rro_overlays/HbmSVManagerOverlay/AndroidManifest.xml b/bluejay/rro_overlays/HbmSVManagerOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..b8e8d1f
--- /dev/null
+++ b/bluejay/rro_overlays/HbmSVManagerOverlay/AndroidManifest.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.hbmsvmanager.overlay">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="0"
+        android:targetPackage="com.android.hbmsvmanager" />
+</manifest>
diff --git a/bluejay/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_0_cal0.png b/bluejay/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_0_cal0.png
new file mode 100644
index 0000000..6bbb70a
Binary files /dev/null and b/bluejay/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_0_cal0.png differ
diff --git a/bluejay/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_1_cal0.png b/bluejay/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_1_cal0.png
new file mode 100644
index 0000000..de7d600
Binary files /dev/null and b/bluejay/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_1_cal0.png differ
diff --git a/bluejay/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_2_cal0.png b/bluejay/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_2_cal0.png
new file mode 100644
index 0000000..8debb3c
Binary files /dev/null and b/bluejay/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_2_cal0.png differ
diff --git a/bluejay/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_3_cal0.png b/bluejay/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_3_cal0.png
new file mode 100644
index 0000000..fdbb291
Binary files /dev/null and b/bluejay/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_3_cal0.png differ
diff --git a/bluejay/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_4_cal0.png b/bluejay/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_4_cal0.png
new file mode 100644
index 0000000..087a639
Binary files /dev/null and b/bluejay/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_4_cal0.png differ
diff --git a/bluejay/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_5_cal0.png b/bluejay/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_5_cal0.png
new file mode 100644
index 0000000..0ca696b
Binary files /dev/null and b/bluejay/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_5_cal0.png differ
diff --git a/bluejay/rro_overlays/HbmSVManagerOverlay/res/values/config.xml b/bluejay/rro_overlays/HbmSVManagerOverlay/res/values/config.xml
new file mode 100644
index 0000000..42862b6
--- /dev/null
+++ b/bluejay/rro_overlays/HbmSVManagerOverlay/res/values/config.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2020, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<resources>
+    <string-array name="config_calibrated_compensation_images">
+        <item>SCI_0_cal0.png</item>
+        <item>SCI_1_cal0.png</item>
+        <item>SCI_2_cal0.png</item>
+        <item>SCI_3_cal0.png</item>
+        <item>SCI_4_cal0.png</item>
+        <item>SCI_5_cal0.png</item>
+    </string-array>
+    <array name="config_compensation_images">
+        <item>@drawable/SCI_0_cal0</item>
+        <item>@drawable/SCI_1_cal0</item>
+        <item>@drawable/SCI_2_cal0</item>
+        <item>@drawable/SCI_3_cal0</item>
+        <item>@drawable/SCI_4_cal0</item>
+        <item>@drawable/SCI_5_cal0</item>
+    </array>
+    <integer name="config_compensation_filter_horizon">1500</integer>
+    <dimen name="config_compensation_filter_intercept">10.0</dimen>
+    <dimen name="config_compensation_lux_enter_threshold">7000.0</dimen>
+    <array name="config_compensation_thresholds">
+        <item>7000.0</item>
+        <item>10000.0</item>
+        <item>35000.0</item>
+        <item>50000.0</item>
+        <item>80000.0</item>
+        <item>100000.0</item>
+    </array>
+</resources>
diff --git a/device-lineage.mk b/device-lineage.mk
index a861d8f..b4c8639 100644
--- a/device-lineage.mk
+++ b/device-lineage.mk
@@ -14,6 +14,10 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.telephony.euicc.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/android.hardware.telephony.euicc.xml
 
+# HBM
+PRODUCT_PACKAGES := \
+    HbmSVManagerOverlay
+
 # Build necessary packages for vendor
 
 # Codec2