diff --git a/core/res/assets/images/android-logo-mask.png b/core/res/assets/images/android-logo-mask.png
index 5512c0ad8a83..a998f1d52313 100644
Binary files a/core/res/assets/images/android-logo-mask.png and b/core/res/assets/images/android-logo-mask.png differ
diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
index 4bc70cf5856e..09c5fd36ea7d 100644
--- a/services/core/java/com/android/server/display/DisplayPowerController.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController.java
@@ -82,7 +82,12 @@ import com.android.server.display.whitebalance.DisplayWhiteBalanceFactory;
 import com.android.server.display.whitebalance.DisplayWhiteBalanceSettings;
 import com.android.server.policy.WindowManagerPolicy;
 
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
 import java.io.PrintWriter;
+import java.io.Writer;
 import java.util.Objects;
 
 /**
@@ -1292,6 +1297,18 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
         }
     }
 
+    private void changeKeyboardBacklightState(String value) {
+        try {
+          File outputFile = new File("/sys/class/leds/keyboard_light/", "brightness");
+          Writer writer = new BufferedWriter(new FileWriter(outputFile));
+
+          writer.write(value);
+          writer.close();
+        } catch (IOException e) {
+          Slog.d("NEHEMIAH", "Sorry, failed to change the value of the keyboard backlight");
+        }
+    }
+
     private void loadBrightnessRampRates() {
         mBrightnessRampRateFastDecrease = mDisplayDeviceConfig.getBrightnessRampFastDecrease();
         mBrightnessRampRateFastIncrease = mDisplayDeviceConfig.getBrightnessRampFastIncrease();
@@ -2005,6 +2022,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
                 && mReportedScreenStateToPolicy == REPORTED_TO_POLICY_SCREEN_TURNING_ON) {
             setReportedScreenState(REPORTED_TO_POLICY_SCREEN_ON);
             mWindowManagerPolicy.screenTurnedOn(mDisplayId);
+            changeKeyboardBacklightState("255");
         }
 
         // Grab a wake lock if we have unfinished business.
@@ -2264,6 +2282,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
             setReportedScreenState(REPORTED_TO_POLICY_SCREEN_OFF);
             unblockScreenOn();
             mWindowManagerPolicy.screenTurnedOff(mDisplayId, mIsInTransition);
+            changeKeyboardBacklightState("0");
         } else if (!isOff
                 && mReportedScreenStateToPolicy == REPORTED_TO_POLICY_SCREEN_TURNING_OFF) {
 
@@ -2272,6 +2291,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
             unblockScreenOff();
             mWindowManagerPolicy.screenTurnedOff(mDisplayId, mIsInTransition);
             setReportedScreenState(REPORTED_TO_POLICY_SCREEN_OFF);
+            changeKeyboardBacklightState("0");
         }
         if (!isOff
                 && (mReportedScreenStateToPolicy == REPORTED_TO_POLICY_SCREEN_OFF