diff --git a/device-lineage.mk b/device-lineage.mk
index 67195d9..6a3aa48 100644
--- a/device-lineage.mk
+++ b/device-lineage.mk
@@ -17,6 +17,10 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     EuiccSupportPixelOverlay
 
+# HBM
+PRODUCT_PACKAGES += \
+    HbmSVManagerOverlayFelix
+
 # wireless_charger HAL service
 include device/google/gs-common/wireless_charger/wireless_charger.mk
 
diff --git a/rro_overlays/HbmSVManagerOverlay/Android.bp b/rro_overlays/HbmSVManagerOverlay/Android.bp
new file mode 100644
index 0000000..9e1dbef
--- /dev/null
+++ b/rro_overlays/HbmSVManagerOverlay/Android.bp
@@ -0,0 +1,8 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "HbmSVManagerOverlayFelix",
+    vendor: true
+}
diff --git a/rro_overlays/HbmSVManagerOverlay/AndroidManifest.xml b/rro_overlays/HbmSVManagerOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..b8e8d1f
--- /dev/null
+++ b/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/rro_overlays/HbmSVManagerOverlay/res/drawable/TCI_0_cal0.png b/rro_overlays/HbmSVManagerOverlay/res/drawable/TCI_0_cal0.png
new file mode 100644
index 0000000..5f23c97
Binary files /dev/null and b/rro_overlays/HbmSVManagerOverlay/res/drawable/TCI_0_cal0.png differ
diff --git a/rro_overlays/HbmSVManagerOverlay/res/drawable/TCI_1_cal0.png b/rro_overlays/HbmSVManagerOverlay/res/drawable/TCI_1_cal0.png
new file mode 100644
index 0000000..bba752f
Binary files /dev/null and b/rro_overlays/HbmSVManagerOverlay/res/drawable/TCI_1_cal0.png differ
diff --git a/rro_overlays/HbmSVManagerOverlay/res/drawable/TCI_2_cal0.png b/rro_overlays/HbmSVManagerOverlay/res/drawable/TCI_2_cal0.png
new file mode 100644
index 0000000..375d6fb
Binary files /dev/null and b/rro_overlays/HbmSVManagerOverlay/res/drawable/TCI_2_cal0.png differ
diff --git a/rro_overlays/HbmSVManagerOverlay/res/drawable/TCI_3_cal0.png b/rro_overlays/HbmSVManagerOverlay/res/drawable/TCI_3_cal0.png
new file mode 100644
index 0000000..939056f
Binary files /dev/null and b/rro_overlays/HbmSVManagerOverlay/res/drawable/TCI_3_cal0.png differ
diff --git a/rro_overlays/HbmSVManagerOverlay/res/drawable/TCI_4_cal0.png b/rro_overlays/HbmSVManagerOverlay/res/drawable/TCI_4_cal0.png
new file mode 100644
index 0000000..8445608
Binary files /dev/null and b/rro_overlays/HbmSVManagerOverlay/res/drawable/TCI_4_cal0.png differ
diff --git a/rro_overlays/HbmSVManagerOverlay/res/drawable/TCI_5_cal0.png b/rro_overlays/HbmSVManagerOverlay/res/drawable/TCI_5_cal0.png
new file mode 100644
index 0000000..bbeadfb
Binary files /dev/null and b/rro_overlays/HbmSVManagerOverlay/res/drawable/TCI_5_cal0.png differ
diff --git a/rro_overlays/HbmSVManagerOverlay/res/drawable/TCI_6_cal0.png b/rro_overlays/HbmSVManagerOverlay/res/drawable/TCI_6_cal0.png
new file mode 100644
index 0000000..bbeadfb
Binary files /dev/null and b/rro_overlays/HbmSVManagerOverlay/res/drawable/TCI_6_cal0.png differ
diff --git a/rro_overlays/HbmSVManagerOverlay/res/drawable/TCI_7_cal0.png b/rro_overlays/HbmSVManagerOverlay/res/drawable/TCI_7_cal0.png
new file mode 100644
index 0000000..8445608
Binary files /dev/null and b/rro_overlays/HbmSVManagerOverlay/res/drawable/TCI_7_cal0.png differ
diff --git a/rro_overlays/HbmSVManagerOverlay/res/drawable/TCI_8_cal0.png b/rro_overlays/HbmSVManagerOverlay/res/drawable/TCI_8_cal0.png
new file mode 100644
index 0000000..8e346ee
Binary files /dev/null and b/rro_overlays/HbmSVManagerOverlay/res/drawable/TCI_8_cal0.png differ
diff --git a/rro_overlays/HbmSVManagerOverlay/res/values/config.xml b/rro_overlays/HbmSVManagerOverlay/res/values/config.xml
new file mode 100644
index 0000000..88143b0
--- /dev/null
+++ b/rro_overlays/HbmSVManagerOverlay/res/values/config.xml
@@ -0,0 +1,73 @@
+<?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>
+    <array name="config_compensation_brightness_conditions">
+        <item>0.001505017</item>
+        <item>0.004013378</item>
+        <item>0.008016032</item>
+        <item>0.022044089</item>
+    </array>
+    <array name="config_compensation_temperature_conditions_0">
+        <item>0.0</item>
+        <item>4.0</item>
+    </array>
+    <array name="config_compensation_temperature_conditions_1">
+        <item>0.0</item>
+        <item>4.0</item>
+    </array>
+    <array name="config_compensation_temperature_conditions_2">
+        <item>0.0</item>
+        <item>4.0</item>
+        <item>8.0</item>
+    </array>
+    <array name="config_compensation_temperature_conditions_3">
+        <item>0.0</item>
+        <item>6.0</item>
+    </array>
+    <array name="config_compensation_temperature_conditions_list">
+        <item>@array/config_compensation_temperature_conditions_0</item>
+        <item>@array/config_compensation_temperature_conditions_1</item>
+        <item>@array/config_compensation_temperature_conditions_2</item>
+        <item>@array/config_compensation_temperature_conditions_3</item>
+    </array>
+    <string-array name="config_hbmHalServiceArray">
+        <item>default</item>
+        <item>secondary</item>
+    </string-array>
+    <string-array name="config_hbmSvAmbientSensorArray">
+        <item>TCS3701 Ambient Light</item>
+        <item>TMD3719 Ambient Light</item>
+    </string-array>
+    <string-array name="config_hbmSvDisplayIdArray">
+        <item>local:4619827677550801152</item>
+        <item>local:4619827677550801153</item>
+    </string-array>
+    <array name="config_thermal_compensation_images">
+        <item>@drawable/TCI_0_cal0</item>
+        <item>@drawable/TCI_1_cal0</item>
+        <item>@drawable/TCI_2_cal0</item>
+        <item>@drawable/TCI_3_cal0</item>
+        <item>@drawable/TCI_4_cal0</item>
+        <item>@drawable/TCI_5_cal0</item>
+        <item>@drawable/TCI_6_cal0</item>
+        <item>@drawable/TCI_7_cal0</item>
+        <item>@drawable/TCI_8_cal0</item>
+    </array>
+</resources>