diff --git a/a10/device.mk b/a10/device.mk
index e346923..0dd5ee7 100644
--- a/a10/device.mk
+++ b/a10/device.mk
@@ -11,9 +11,6 @@ $(call inherit-product, vendor/samsung/a10/a10-vendor.mk)
 
 $(call inherit-product, frameworks/native/build/phone-xhdpi-2048-dalvik-heap.mk)
 
-PRODUCT_PACKAGES += \
-    CameraLightSensor
-
 # USB
 PRODUCT_PACKAGES += \
     android.hardware.usb@1.0-service.a10
diff --git a/a20/device.mk b/a20/device.mk
index b0ae87e..6a28774 100644
--- a/a20/device.mk
+++ b/a20/device.mk
@@ -12,9 +12,6 @@ $(call inherit-product, frameworks/native/build/phone-xhdpi-4096-dalvik-heap.mk)
 # Derp
 DERP_BUILDTYPE := Official
 
-PRODUCT_PACKAGES += \
-    CameraLightSensor
-    
 # USB
 PRODUCT_PACKAGES += \
     android.hardware.usb@1.3-service.samsung
diff --git a/a20e/device.mk b/a20e/device.mk
index b6953fa..a622047 100644
--- a/a20e/device.mk
+++ b/a20e/device.mk
@@ -12,9 +12,6 @@ $(call inherit-product, frameworks/native/build/phone-xhdpi-4096-dalvik-heap.mk)
 # Derp
 DERP_BUILDTYPE := Official
 
-PRODUCT_PACKAGES += \
-    CameraLightSensor
-
 # USB
 PRODUCT_PACKAGES += \
     android.hardware.usb@1.3-service.samsung
diff --git a/a30/overlay/frameworks/base/core/res/res/values/config.xml b/a30/overlay/frameworks/base/core/res/res/values/config.xml
index 30bde11..0bf7342 100644
--- a/a30/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/a30/overlay/frameworks/base/core/res/res/values/config.xml
@@ -57,6 +57,7 @@
       <item>0:2:15</item>
       <!-- ID0:Fingerprint:Strong -->
    </string-array>
+   <bool name="config_automatic_brightness_available">true</bool>
    <!-- For performance and storage reasons, limit the number of fingerprints per user -->
    <integer name="config_fingerprintMaxTemplatesPerUser">4</integer>
    <!-- Specify if the fingerprint hardware support gestures-->
diff --git a/a30s/overlay/frameworks/base/core/res/res/values/config.xml b/a30s/overlay/frameworks/base/core/res/res/values/config.xml
index 30bde11..de0579f 100644
--- a/a30s/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/a30s/overlay/frameworks/base/core/res/res/values/config.xml
@@ -65,4 +65,5 @@
    <bool name="config_supportSystemNavigationKeys">true</bool>
    <!-- Limit for the number of face templates per user -->
    <integer name="config_faceMaxTemplatesPerUser">2</integer>
+   <bool name="config_automatic_brightness_available">true</bool>
 </resources>
diff --git a/a40/overlay/frameworks/base/core/res/res/values/config.xml b/a40/overlay/frameworks/base/core/res/res/values/config.xml
index 30bde11..de0579f 100644
--- a/a40/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/a40/overlay/frameworks/base/core/res/res/values/config.xml
@@ -65,4 +65,5 @@
    <bool name="config_supportSystemNavigationKeys">true</bool>
    <!-- Limit for the number of face templates per user -->
    <integer name="config_faceMaxTemplatesPerUser">2</integer>
+   <bool name="config_automatic_brightness_available">true</bool>
 </resources>
diff --git a/universal7885-common/overlay/frameworks/base/core/res/res/values/config.xml b/universal7885-common/overlay/frameworks/base/core/res/res/values/config.xml
index 92c8f1d..c8d8487 100644
--- a/universal7885-common/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/universal7885-common/overlay/frameworks/base/core/res/res/values/config.xml
@@ -145,7 +145,7 @@
          Off by default, since the framebuffer readback used to implement the
          fading edges is prohibitively expensive on most GPUs. -->
    <bool name="config_ui_enableFadingMarquee">true</bool>
-   <bool name="config_automatic_brightness_available">true</bool>
+
    <integer name="config_autoBrightnessBrighteningLightDebounce">2000</integer>
    <integer name="config_autoBrightnessDarkeningLightDebounce">4000</integer>
    <integer-array name="config_autoBrightnessDisplayValuesNits">