diff --git a/device.mk b/device.mk
index 9b69cce..8bcb100 100644
--- a/device.mk
+++ b/device.mk
@@ -15,6 +15,11 @@ DEVICE_PACKAGE_OVERLAYS += \
     $(LOCAL_PATH)/overlay \
     $(LOCAL_PATH)/overlay-lineage
 
+PRODUCT_PACKAGES += \
+    xiaomi_umi_hwlevel_default_overlay \
+    xiaomi_umi_hwlevel_p01_overlay \
+    xiaomi_umi_hwlevel_p1_overlay
+
 # Device uses high-density artwork where available
 PRODUCT_AAPT_CONFIG := normal
 PRODUCT_AAPT_PREF_CONFIG := xhdpi
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index a4b9f73..27a4620 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -442,18 +442,6 @@
     <!-- If true, the display will be shifted around in ambient mode. -->
     <bool name="config_enableBurnInProtection">true</bool>
 
-    <!-- The properties of a UDFPS sensor in pixels, in the order listed below: -->
-    <integer-array name="config_udfps_sensor_props" translatable="false" >
-      <!--
-        <item>sensorLocationX</item>
-        <item>sensorLocationY</item>
-        <item>sensorRadius</item>
-      -->
-        <item>540</item>
-        <item>1907</item>
-        <item>99</item>
-    </integer-array>
-
     <!-- How long it takes for the HW to start illuminating after the illumination is requested. -->
     <integer name="config_udfps_illumination_transition_ms">0</integer>
 </resources>
diff --git a/rootdir/etc/init.device.rc b/rootdir/etc/init.device.rc
index 4e0b052..22ebc97 100644
--- a/rootdir/etc/init.device.rc
+++ b/rootdir/etc/init.device.rc
@@ -1,15 +1,3 @@
 # PowerShare
 on boot
     chown system system /sys/devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm8150b@2:qcom,qpnp-smb5/power_supply/wireless/reverse_chg_mode
-
-# FOD
-on property:ro.boot.hwlevel=P0.1
-    setprop vendor.lineage.fod.position_x 449
-    setprop vendor.lineage.fod.position_y 1825
-
-on property:ro.boot.hwlevel=P1
-    setprop vendor.lineage.fod.position_x 449
-    setprop vendor.lineage.fod.position_y 1825
-
-on property:ro.boot.hwlevel=*
-    setprop vendor.lineage.fod.enable true
diff --git a/rro_overlays/xiaomi_umi_hwlevel_default_overlay/Android.bp b/rro_overlays/xiaomi_umi_hwlevel_default_overlay/Android.bp
new file mode 100644
index 0000000..6c77c16
--- /dev/null
+++ b/rro_overlays/xiaomi_umi_hwlevel_default_overlay/Android.bp
@@ -0,0 +1,5 @@
+runtime_resource_overlay {
+    name: "xiaomi_umi_hwlevel_default_overlay",
+    sdk_version: "current",
+    vendor: true
+}
diff --git a/rro_overlays/xiaomi_umi_hwlevel_default_overlay/AndroidManifest.xml b/rro_overlays/xiaomi_umi_hwlevel_default_overlay/AndroidManifest.xml
new file mode 100644
index 0000000..0d7b827
--- /dev/null
+++ b/rro_overlays/xiaomi_umi_hwlevel_default_overlay/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.xiaomi_sm8250.umi.overlay.hwlevel_default"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <application android:hasCode="false" />
+    <overlay
+      android:targetPackage="android"
+      android:isStatic="true"
+      android:priority="1"/>
+</manifest>
diff --git a/rro_overlays/xiaomi_umi_hwlevel_default_overlay/res/values/config.xml b/rro_overlays/xiaomi_umi_hwlevel_default_overlay/res/values/config.xml
new file mode 100644
index 0000000..f896755
--- /dev/null
+++ b/rro_overlays/xiaomi_umi_hwlevel_default_overlay/res/values/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2017 The LineageOS 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- The properties of a UDFPS sensor in pixels, in the order listed below: -->
+    <integer-array name="config_udfps_sensor_props" translatable="false" >
+      <!--
+        <item>sensorLocationX</item>
+        <item>sensorLocationY</item>
+        <item>sensorRadius</item>
+      -->
+        <item>540</item>
+        <item>1907</item>
+        <item>99</item>
+    </integer-array>
+</resources>
diff --git a/rro_overlays/xiaomi_umi_hwlevel_p01_overlay/Android.bp b/rro_overlays/xiaomi_umi_hwlevel_p01_overlay/Android.bp
new file mode 100644
index 0000000..ebf8012
--- /dev/null
+++ b/rro_overlays/xiaomi_umi_hwlevel_p01_overlay/Android.bp
@@ -0,0 +1,5 @@
+runtime_resource_overlay {
+    name: "xiaomi_umi_hwlevel_p01_overlay",
+    sdk_version: "current",
+    vendor: true
+}
diff --git a/rro_overlays/xiaomi_umi_hwlevel_p01_overlay/AndroidManifest.xml b/rro_overlays/xiaomi_umi_hwlevel_p01_overlay/AndroidManifest.xml
new file mode 100644
index 0000000..09dd00e
--- /dev/null
+++ b/rro_overlays/xiaomi_umi_hwlevel_p01_overlay/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.xiaomi_sm8250.umi.overlay.hwlevel_p01"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <application android:hasCode="false" />
+    <overlay
+      android:requiredSystemPropertyName="ro.boot.hwlevel"
+      android:requiredSystemPropertyValue="P0.1"
+      android:targetPackage="android"
+      android:isStatic="true"
+      android:priority="2"/>
+</manifest>
diff --git a/rro_overlays/xiaomi_umi_hwlevel_p01_overlay/res/values/config.xml b/rro_overlays/xiaomi_umi_hwlevel_p01_overlay/res/values/config.xml
new file mode 100644
index 0000000..ee40bc0
--- /dev/null
+++ b/rro_overlays/xiaomi_umi_hwlevel_p01_overlay/res/values/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2017 The LineageOS 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- The properties of a UDFPS sensor in pixels, in the order listed below: -->
+    <integer-array name="config_udfps_sensor_props" translatable="false" >
+      <!--
+        <item>sensorLocationX</item>
+        <item>sensorLocationY</item>
+        <item>sensorRadius</item>
+      -->
+        <item>549</item>
+        <item>1925</item>
+        <item>99</item>
+    </integer-array>
+</resources>
\ No newline at end of file
diff --git a/rro_overlays/xiaomi_umi_hwlevel_p1_overlay/Android.bp b/rro_overlays/xiaomi_umi_hwlevel_p1_overlay/Android.bp
new file mode 100644
index 0000000..f222629
--- /dev/null
+++ b/rro_overlays/xiaomi_umi_hwlevel_p1_overlay/Android.bp
@@ -0,0 +1,5 @@
+runtime_resource_overlay {
+    name: "xiaomi_umi_hwlevel_p1_overlay",
+    sdk_version: "current",
+    vendor: true
+}
diff --git a/rro_overlays/xiaomi_umi_hwlevel_p1_overlay/AndroidManifest.xml b/rro_overlays/xiaomi_umi_hwlevel_p1_overlay/AndroidManifest.xml
new file mode 100644
index 0000000..4e2e903
--- /dev/null
+++ b/rro_overlays/xiaomi_umi_hwlevel_p1_overlay/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.xiaomi_sm8250.umi.overlay.hwlevel_p1"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <application android:hasCode="false" />
+    <overlay
+      android:requiredSystemPropertyName="ro.boot.hwlevel"
+      android:requiredSystemPropertyValue="P1"
+      android:targetPackage="android"
+      android:isStatic="true"
+      android:priority="2"/>
+</manifest>
diff --git a/rro_overlays/xiaomi_umi_hwlevel_p1_overlay/res/values/config.xml b/rro_overlays/xiaomi_umi_hwlevel_p1_overlay/res/values/config.xml
new file mode 100644
index 0000000..ee40bc0
--- /dev/null
+++ b/rro_overlays/xiaomi_umi_hwlevel_p1_overlay/res/values/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2017 The LineageOS 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- The properties of a UDFPS sensor in pixels, in the order listed below: -->
+    <integer-array name="config_udfps_sensor_props" translatable="false" >
+      <!--
+        <item>sensorLocationX</item>
+        <item>sensorLocationY</item>
+        <item>sensorRadius</item>
+      -->
+        <item>549</item>
+        <item>1925</item>
+        <item>99</item>
+    </integer-array>
+</resources>
\ No newline at end of file
diff --git a/sepolicy/vendor/system_server.te b/sepolicy/vendor/system_server.te
new file mode 100644
index 0000000..04c19f0
--- /dev/null
+++ b/sepolicy/vendor/system_server.te
@@ -0,0 +1 @@
+get_prop(system_server, bootloader_prop)
diff --git a/sepolicy/vendor/zygote.te b/sepolicy/vendor/zygote.te
new file mode 100644
index 0000000..7664154
--- /dev/null
+++ b/sepolicy/vendor/zygote.te
@@ -0,0 +1 @@
+get_prop(zygote, bootloader_prop)