2 files changed, 3 insertions, 4 deletions
diff --git a/device.mk b/device.mk
index 50894ff..0bc7572 100755
--- a/device.mk
+++ b/device.mk
@@ -26,10 +26,6 @@ $(call inherit-product-if-exists, vendor/zuk/z2_plus/z2_plus-vendor.mk)
 # Overlays
 DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
 
-# Device was launched with M
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.product.first_api_level=23
-
 # ANT+
 PRODUCT_PACKAGES += \
     AntHalService \
diff --git a/system.prop b/system.prop
index c9cc0a7..ec48151 100644
--- a/system.prop
+++ b/system.prop
@@ -43,6 +43,9 @@ persist.data.netmgrd.qos.enable=true
 ro.use_data_netmgrd=true
 persist.data.iwlan.enable=true
 
+# Device was launched with M
+ro.product.first_api_level=23
+
 # Display (Qualcomm AD)
 ro.qualcomm.cabl=2
 ro.qcom.ad=1