diff --git a/core/java/android/hardware/hdmi/HdmiControlManager.java b/core/java/android/hardware/hdmi/HdmiControlManager.java
index eef4089ac336e..ae10f4006ce5c 100644
--- a/core/java/android/hardware/hdmi/HdmiControlManager.java
+++ b/core/java/android/hardware/hdmi/HdmiControlManager.java
@@ -367,35 +367,35 @@ public final class HdmiControlManager {
     @Retention(RetentionPolicy.SOURCE)
     public @interface HdmiCecVersion {}
 
-    // -- Which devices the playback device can send a <Standby> message to upon going to sleep.
+    // -- Scope of CEC power control messages sent by a playback device.
     /**
-     * Send <Standby> to TV only.
+     * Send CEC power control messages to TV only.
      *
      * @hide
      */
-    public static final String SEND_STANDBY_ON_SLEEP_TO_TV = "to_tv";
+    public static final String POWER_CONTROL_MODE_TV = "to_tv";
     /**
-     * Broadcast <Standby> to all devices in the network.
+     * Broadcast CEC power control messages to all devices in the network.
      *
      * @hide
      */
-    public static final String SEND_STANDBY_ON_SLEEP_BROADCAST = "broadcast";
+    public static final String POWER_CONTROL_MODE_BROADCAST = "broadcast";
     /**
-     * Don't send any <Standby> message.
+     * Don't send any CEC power control messages.
      *
      * @hide
      */
-    public static final String SEND_STANDBY_ON_SLEEP_NONE = "none";
+    public static final String POWER_CONTROL_MODE_NONE = "none";
     /**
      * @hide
      */
     @StringDef({
-            SEND_STANDBY_ON_SLEEP_TO_TV,
-            SEND_STANDBY_ON_SLEEP_BROADCAST,
-            SEND_STANDBY_ON_SLEEP_NONE
+            POWER_CONTROL_MODE_TV,
+            POWER_CONTROL_MODE_BROADCAST,
+            POWER_CONTROL_MODE_NONE
     })
     @Retention(RetentionPolicy.SOURCE)
-    public @interface StandbyBehavior {}
+    public @interface PowerControlMode {}
 
     // -- Which power state action should be taken when Active Source is lost.
     /**
@@ -457,11 +457,11 @@ public final class HdmiControlManager {
      */
     public static final String CEC_SETTING_NAME_HDMI_CEC_VERSION = "hdmi_cec_version";
     /**
-     * Name of a setting deciding on the Standby message behaviour on sleep.
+     * Name of a setting deciding on the power control mode.
      *
      * @hide
      */
-    public static final String CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP = "send_standby_on_sleep";
+    public static final String CEC_SETTING_NAME_POWER_CONTROL_MODE = "send_standby_on_sleep";
     /**
      * Name of a setting deciding on power state action when losing Active Source.
      *
@@ -482,7 +482,7 @@ public final class HdmiControlManager {
     @StringDef({
         CEC_SETTING_NAME_HDMI_CEC_ENABLED,
         CEC_SETTING_NAME_HDMI_CEC_VERSION,
-        CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP,
+        CEC_SETTING_NAME_POWER_CONTROL_MODE,
         CEC_SETTING_NAME_POWER_STATE_CHANGE_ON_ACTIVE_SOURCE_LOST,
         CEC_SETTING_NAME_SYSTEM_AUDIO_MODE_MUTING,
     })
@@ -1506,7 +1506,7 @@ public final class HdmiControlManager {
     }
 
     /**
-     * Set the 'send_standby_on_sleep' option.
+     * Set the 'power_control_mode' option.
      *
      * @param value the desired value
      * @throws IllegalArgumentException when the new value is not allowed.
@@ -1515,20 +1515,20 @@ public final class HdmiControlManager {
      * @hide
      */
     @RequiresPermission(android.Manifest.permission.HDMI_CEC)
-    public void setSendStandbyOnSleep(@NonNull @StandbyBehavior String value) {
+    public void setPowerControlMode(@NonNull @PowerControlMode String value) {
         if (mService == null) {
             Log.e(TAG, "HdmiControlService is not available");
             throw new RuntimeException("HdmiControlService is not available");
         }
         try {
-            mService.setCecSettingStringValue(CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP, value);
+            mService.setCecSettingStringValue(CEC_SETTING_NAME_POWER_CONTROL_MODE, value);
         } catch (RemoteException e) {
             throw e.rethrowFromSystemServer();
         }
     }
 
     /**
-     * Get the value of 'send_standby_on_sleep' option.
+     * Get the value of 'power_control_mode' option.
      *
      * @return the current value.
      * @throws RuntimeException when the HdmiControlService is not available.
@@ -1536,15 +1536,15 @@ public final class HdmiControlManager {
      * @hide
      */
     @NonNull
-    @StandbyBehavior
+    @PowerControlMode
     @RequiresPermission(android.Manifest.permission.HDMI_CEC)
-    public String getSendStandbyOnSleep() {
+    public String getPowerControlMode() {
         if (mService == null) {
             Log.e(TAG, "HdmiControlService is not available");
             throw new RuntimeException("HdmiControlService is not available");
         }
         try {
-            return mService.getCecSettingStringValue(CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP);
+            return mService.getCecSettingStringValue(CEC_SETTING_NAME_POWER_CONTROL_MODE);
         } catch (RemoteException e) {
             throw e.rethrowFromSystemServer();
         }
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 884f8ccd5e54f..fde5b349fddb2 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -9961,13 +9961,13 @@ public final class Settings {
          * upon going to sleep. It additionally controls whether a playback device attempts to turn
          * on the connected Audio system when waking up. Supported values are:
          * <ul>
-         * <li>{@link HdmiControlManager#SEND_STANDBY_ON_SLEEP_TO_TV} Upon going to sleep, device
+         * <li>{@link HdmiControlManager#POWER_CONTROL_MODE_TV} Upon going to sleep, device
          * sends {@code <Standby>} to TV only. Upon waking up, device does not turn on the Audio
          * system via {@code <System Audio Mode Request>}.</li>
-         * <li>{@link HdmiControlManager#SEND_STANDBY_ON_SLEEP_BROADCAST} Upon going to sleep,
+         * <li>{@link HdmiControlManager#POWER_CONTROL_MODE_BROADCAST} Upon going to sleep,
          * device sends {@code <Standby>} to all devices in the network. Upon waking up, device
          * attempts to turn on the Audio system via {@code <System Audio Mode Request>}.</li>
-         * <li>{@link HdmiControlManager#SEND_STANDBY_ON_SLEEP_NONE} Upon going to sleep, device
+         * <li>{@link HdmiControlManager#POWER_CONTROL_MODE_NONE} Upon going to sleep, device
          * does not send any {@code <Standby>} message. Upon waking up, device does not turn on the
          * Audio system via {@code <System Audio Mode Request>}.</li>
          * </ul>
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecConfig.java b/services/core/java/com/android/server/hdmi/HdmiCecConfig.java
index 0566d32160fc0..982e36ae78973 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecConfig.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecConfig.java
@@ -253,7 +253,7 @@ public class HdmiCecConfig {
                 return STORAGE_GLOBAL_SETTINGS;
             case HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_VERSION:
                 return STORAGE_GLOBAL_SETTINGS;
-            case HdmiControlManager.CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP:
+            case HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE:
                 return STORAGE_GLOBAL_SETTINGS;
             case HdmiControlManager.CEC_SETTING_NAME_POWER_STATE_CHANGE_ON_ACTIVE_SOURCE_LOST:
                 return STORAGE_SHARED_PREFS;
@@ -271,7 +271,7 @@ public class HdmiCecConfig {
                 return Global.HDMI_CONTROL_ENABLED;
             case HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_VERSION:
                 return Global.HDMI_CEC_VERSION;
-            case HdmiControlManager.CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP:
+            case HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE:
                 return Global.HDMI_CONTROL_SEND_STANDBY_ON_SLEEP;
             case HdmiControlManager.CEC_SETTING_NAME_POWER_STATE_CHANGE_ON_ACTIVE_SOURCE_LOST:
                 return setting.getName();
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
index 9ca1f913f5cea..e6cf18b8db3d6 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
@@ -160,20 +160,20 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource {
         switch (standbyAction) {
             case HdmiControlService.STANDBY_SCREEN_OFF:
                 // Get latest setting value
-                @HdmiControlManager.StandbyBehavior
+                @HdmiControlManager.PowerControlMode
                 String sendStandbyOnSleep = mService.getHdmiCecConfig().getStringValue(
-                        HdmiControlManager.CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP);
+                        HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE);
                 switch (sendStandbyOnSleep) {
-                    case HdmiControlManager.SEND_STANDBY_ON_SLEEP_TO_TV:
+                    case HdmiControlManager.POWER_CONTROL_MODE_TV:
                         mService.sendCecCommand(
                                 HdmiCecMessageBuilder.buildStandby(mAddress, Constants.ADDR_TV));
                         break;
-                    case HdmiControlManager.SEND_STANDBY_ON_SLEEP_BROADCAST:
+                    case HdmiControlManager.POWER_CONTROL_MODE_BROADCAST:
                         mService.sendCecCommand(
                                 HdmiCecMessageBuilder.buildStandby(mAddress,
                                         Constants.ADDR_BROADCAST));
                         break;
-                    case HdmiControlManager.SEND_STANDBY_ON_SLEEP_NONE:
+                    case HdmiControlManager.POWER_CONTROL_MODE_NONE:
                         break;
                 }
                 break;
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceSource.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceSource.java
index 59ebdd5972795..8a1a728ba8dd7 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceSource.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceSource.java
@@ -107,8 +107,8 @@ abstract class HdmiCecLocalDeviceSource extends HdmiCecLocalDevice {
     protected void sendStandby(int deviceId) {
         assertRunOnServiceThread();
         String sendStandbyOnSleep = mService.getHdmiCecConfig().getStringValue(
-                HdmiControlManager.CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP);
-        if (sendStandbyOnSleep.equals(HdmiControlManager.SEND_STANDBY_ON_SLEEP_BROADCAST)) {
+                HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE);
+        if (sendStandbyOnSleep.equals(HdmiControlManager.POWER_CONTROL_MODE_BROADCAST)) {
             mService.sendCecCommand(
                     HdmiCecMessageBuilder.buildStandby(mAddress, Constants.ADDR_BROADCAST));
             return;
diff --git a/services/core/java/com/android/server/hdmi/OneTouchPlayAction.java b/services/core/java/com/android/server/hdmi/OneTouchPlayAction.java
index f9f97fe7b1843..ea6e61582ea07 100644
--- a/services/core/java/com/android/server/hdmi/OneTouchPlayAction.java
+++ b/services/core/java/com/android/server/hdmi/OneTouchPlayAction.java
@@ -165,9 +165,9 @@ final class OneTouchPlayAction extends HdmiCecFeatureAction {
         if (service.isAudioSystemDevice()) {
             return false;
         }
-        @HdmiControlManager.StandbyBehavior String sendStandbyOnSleep =
+        @HdmiControlManager.PowerControlMode String sendStandbyOnSleep =
                 service.getHdmiCecConfig().getStringValue(
-                        HdmiControlManager.CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP);
-        return sendStandbyOnSleep.equals(HdmiControlManager.SEND_STANDBY_ON_SLEEP_BROADCAST);
+                        HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE);
+        return sendStandbyOnSleep.equals(HdmiControlManager.POWER_CONTROL_MODE_BROADCAST);
     }
 }
diff --git a/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecConfigTest.java b/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecConfigTest.java
index d10e075c51360..777713e4ed5a4 100644
--- a/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecConfigTest.java
+++ b/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecConfigTest.java
@@ -99,7 +99,7 @@ public final class HdmiCecConfigTest {
                 + "</cec-settings>", null);
         assertThat(hdmiCecConfig.getAllSettings())
                 .containsExactly(HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_ENABLED,
-                                 HdmiControlManager.CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP);
+                                 HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE);
     }
 
     @Test
@@ -147,7 +147,7 @@ public final class HdmiCecConfigTest {
                 + "</cec-settings>", null);
         assertThat(hdmiCecConfig.getUserSettings())
                 .containsExactly(HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_ENABLED,
-                                 HdmiControlManager.CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP);
+                                 HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE);
     }
 
     @Test
@@ -230,7 +230,7 @@ public final class HdmiCecConfigTest {
                 + "  </setting>"
                 + "</cec-settings>", null);
         assertTrue(hdmiCecConfig.isStringValueType(
-                    HdmiControlManager.CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP));
+                    HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE));
     }
 
     @Test
@@ -330,10 +330,10 @@ public final class HdmiCecConfigTest {
                 + "  </setting>"
                 + "</cec-settings>", null);
         assertThat(hdmiCecConfig.getAllowedStringValues(
-                    HdmiControlManager.CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP))
-                .containsExactly(HdmiControlManager.SEND_STANDBY_ON_SLEEP_TO_TV,
-                                 HdmiControlManager.SEND_STANDBY_ON_SLEEP_BROADCAST,
-                                 HdmiControlManager.SEND_STANDBY_ON_SLEEP_NONE);
+                    HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE))
+                .containsExactly(HdmiControlManager.POWER_CONTROL_MODE_TV,
+                                 HdmiControlManager.POWER_CONTROL_MODE_BROADCAST,
+                                 HdmiControlManager.POWER_CONTROL_MODE_NONE);
     }
 
     @Test
@@ -374,7 +374,7 @@ public final class HdmiCecConfigTest {
                 + "</cec-settings>", null);
         assertThrows(IllegalArgumentException.class,
                 () -> hdmiCecConfig.getAllowedIntValues(
-                    HdmiControlManager.CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP));
+                    HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE));
     }
 
     @Test
@@ -479,8 +479,8 @@ public final class HdmiCecConfigTest {
                 + "  </setting>"
                 + "</cec-settings>", null);
         assertThat(hdmiCecConfig.getDefaultStringValue(
-                    HdmiControlManager.CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP))
-                .isEqualTo(HdmiControlManager.SEND_STANDBY_ON_SLEEP_TO_TV);
+                    HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE))
+                .isEqualTo(HdmiControlManager.POWER_CONTROL_MODE_TV);
     }
 
     @Test
@@ -521,7 +521,7 @@ public final class HdmiCecConfigTest {
                 + "</cec-settings>", null);
         assertThrows(IllegalArgumentException.class,
                 () -> hdmiCecConfig.getDefaultIntValue(
-                    HdmiControlManager.CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP));
+                    HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE));
     }
 
     @Test
@@ -610,8 +610,8 @@ public final class HdmiCecConfigTest {
     public void getStringValue_GlobalSetting_BasicSanity() {
         when(mStorageAdapter.retrieveGlobalSetting(
                   Global.HDMI_CONTROL_SEND_STANDBY_ON_SLEEP,
-                  HdmiControlManager.SEND_STANDBY_ON_SLEEP_TO_TV))
-            .thenReturn(HdmiControlManager.SEND_STANDBY_ON_SLEEP_BROADCAST);
+                  HdmiControlManager.POWER_CONTROL_MODE_TV))
+            .thenReturn(HdmiControlManager.POWER_CONTROL_MODE_BROADCAST);
         HdmiCecConfig hdmiCecConfig = HdmiCecConfig.createFromStrings(
                 mContext, mStorageAdapter,
                 "<?xml version='1.0' encoding='utf-8' standalone='yes' ?>"
@@ -628,8 +628,8 @@ public final class HdmiCecConfigTest {
                 + "  </setting>"
                 + "</cec-settings>", null);
         assertThat(hdmiCecConfig.getStringValue(
-                    HdmiControlManager.CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP))
-                .isEqualTo(HdmiControlManager.SEND_STANDBY_ON_SLEEP_BROADCAST);
+                    HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE))
+                .isEqualTo(HdmiControlManager.POWER_CONTROL_MODE_BROADCAST);
     }
 
     @Test
@@ -696,7 +696,7 @@ public final class HdmiCecConfigTest {
                 + "</cec-settings>", null);
         assertThrows(IllegalArgumentException.class,
                 () -> hdmiCecConfig.getIntValue(
-                    HdmiControlManager.CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP));
+                    HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE));
     }
 
     @Test
@@ -812,8 +812,8 @@ public final class HdmiCecConfigTest {
                 + "</cec-settings>", null);
         assertThrows(IllegalArgumentException.class,
                 () -> hdmiCecConfig.setStringValue(
-                        HdmiControlManager.CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP,
-                        HdmiControlManager.SEND_STANDBY_ON_SLEEP_BROADCAST));
+                        HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE,
+                        HdmiControlManager.POWER_CONTROL_MODE_BROADCAST));
     }
 
     @Test
@@ -835,7 +835,7 @@ public final class HdmiCecConfigTest {
                 + "</cec-settings>", null);
         assertThrows(IllegalArgumentException.class,
                 () -> hdmiCecConfig.setStringValue(
-                        HdmiControlManager.CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP,
+                        HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE,
                         "bar"));
     }
 
@@ -856,11 +856,11 @@ public final class HdmiCecConfigTest {
                 + "    <default-value string-value=\"to_tv\" />"
                 + "  </setting>"
                 + "</cec-settings>", null);
-        hdmiCecConfig.setStringValue(HdmiControlManager.CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP,
-                               HdmiControlManager.SEND_STANDBY_ON_SLEEP_BROADCAST);
+        hdmiCecConfig.setStringValue(HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE,
+                               HdmiControlManager.POWER_CONTROL_MODE_BROADCAST);
         verify(mStorageAdapter).storeGlobalSetting(
                   Global.HDMI_CONTROL_SEND_STANDBY_ON_SLEEP,
-                  HdmiControlManager.SEND_STANDBY_ON_SLEEP_BROADCAST);
+                  HdmiControlManager.POWER_CONTROL_MODE_BROADCAST);
     }
 
     @Test
diff --git a/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDevicePlaybackTest.java b/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDevicePlaybackTest.java
index dfeed1362b817..d07470f1c3417 100644
--- a/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDevicePlaybackTest.java
+++ b/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDevicePlaybackTest.java
@@ -557,8 +557,8 @@ public class HdmiCecLocalDevicePlaybackTest {
     @Test
     public void handleOnStandby_ScreenOff_NotActiveSource_ToTv() {
         mHdmiCecLocalDevicePlayback.mService.getHdmiCecConfig().setStringValue(
-                HdmiControlManager.CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP,
-                HdmiControlManager.SEND_STANDBY_ON_SLEEP_TO_TV);
+                HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE,
+                HdmiControlManager.POWER_CONTROL_MODE_TV);
         mHdmiCecLocalDevicePlayback.setActiveSource(ADDR_TV, 0x0000,
                 "HdmiCecLocalDevicePlaybackTest");
         mHdmiCecLocalDevicePlayback.setAutoDeviceOff(true);
@@ -577,8 +577,8 @@ public class HdmiCecLocalDevicePlaybackTest {
     @Test
     public void handleOnStandby_ScreenOff_NotActiveSource_Broadcast() {
         mHdmiCecLocalDevicePlayback.mService.getHdmiCecConfig().setStringValue(
-                HdmiControlManager.CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP,
-                HdmiControlManager.SEND_STANDBY_ON_SLEEP_BROADCAST);
+                HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE,
+                HdmiControlManager.POWER_CONTROL_MODE_BROADCAST);
         mHdmiCecLocalDevicePlayback.setActiveSource(ADDR_TV, 0x0000,
                 "HdmiCecLocalDevicePlaybackTest");
         mHdmiCecLocalDevicePlayback.setAutoDeviceOff(true);
@@ -597,8 +597,8 @@ public class HdmiCecLocalDevicePlaybackTest {
     @Test
     public void handleOnStandby_ScreenOff_NotActiveSource_None() {
         mHdmiCecLocalDevicePlayback.mService.getHdmiCecConfig().setStringValue(
-                HdmiControlManager.CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP,
-                HdmiControlManager.SEND_STANDBY_ON_SLEEP_NONE);
+                HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE,
+                HdmiControlManager.POWER_CONTROL_MODE_NONE);
         mHdmiCecLocalDevicePlayback.setActiveSource(ADDR_TV, 0x0000,
                 "HdmiCecLocalDevicePlaybackTest");
         mHdmiCecLocalDevicePlayback.setAutoDeviceOff(true);
@@ -617,8 +617,8 @@ public class HdmiCecLocalDevicePlaybackTest {
     @Test
     public void handleOnStandby_ScreenOff_ActiveSource_ToTv() {
         mHdmiCecLocalDevicePlayback.mService.getHdmiCecConfig().setStringValue(
-                HdmiControlManager.CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP,
-                HdmiControlManager.SEND_STANDBY_ON_SLEEP_TO_TV);
+                HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE,
+                HdmiControlManager.POWER_CONTROL_MODE_TV);
         mHdmiCecLocalDevicePlayback.setActiveSource(mPlaybackLogicalAddress,
                 mPlaybackPhysicalAddress, "HdmiCecLocalDevicePlaybackTest");
         mHdmiCecLocalDevicePlayback.setAutoDeviceOff(true);
@@ -637,8 +637,8 @@ public class HdmiCecLocalDevicePlaybackTest {
     @Test
     public void handleOnStandby_ScreenOff_ActiveSource_Broadcast() {
         mHdmiCecLocalDevicePlayback.mService.getHdmiCecConfig().setStringValue(
-                HdmiControlManager.CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP,
-                HdmiControlManager.SEND_STANDBY_ON_SLEEP_BROADCAST);
+                HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE,
+                HdmiControlManager.POWER_CONTROL_MODE_BROADCAST);
         mHdmiCecLocalDevicePlayback.setActiveSource(mPlaybackLogicalAddress,
                 mPlaybackPhysicalAddress, "HdmiCecLocalDevicePlaybackTest");
         mHdmiCecLocalDevicePlayback.setAutoDeviceOff(true);
@@ -657,8 +657,8 @@ public class HdmiCecLocalDevicePlaybackTest {
     @Test
     public void handleOnStandby_ScreenOff_ActiveSource_None() {
         mHdmiCecLocalDevicePlayback.mService.getHdmiCecConfig().setStringValue(
-                HdmiControlManager.CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP,
-                HdmiControlManager.SEND_STANDBY_ON_SLEEP_NONE);
+                HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE,
+                HdmiControlManager.POWER_CONTROL_MODE_NONE);
         mHdmiCecLocalDevicePlayback.setActiveSource(mPlaybackLogicalAddress,
                 mPlaybackPhysicalAddress, "HdmiCecLocalDevicePlaybackTest");
         mHdmiCecLocalDevicePlayback.setAutoDeviceOff(true);
@@ -828,8 +828,8 @@ public class HdmiCecLocalDevicePlaybackTest {
                 HdmiControlManager.CEC_SETTING_NAME_POWER_STATE_CHANGE_ON_ACTIVE_SOURCE_LOST,
                 HdmiControlManager.POWER_STATE_CHANGE_ON_ACTIVE_SOURCE_LOST_STANDBY_NOW);
         mHdmiCecLocalDevicePlayback.mService.getHdmiCecConfig().setStringValue(
-                HdmiControlManager.CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP,
-                HdmiControlManager.SEND_STANDBY_ON_SLEEP_BROADCAST);
+                HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE,
+                HdmiControlManager.POWER_CONTROL_MODE_BROADCAST);
         mStandby = false;
         // 1. DUT is <AS>.
         HdmiCecMessage message1 = HdmiCecMessageBuilder.buildActiveSource(ADDR_PLAYBACK_1,
@@ -1141,8 +1141,8 @@ public class HdmiCecLocalDevicePlaybackTest {
     @Test
     public void oneTouchPlay_SendStandbyOnSleepToTv() {
         mHdmiCecLocalDevicePlayback.mService.getHdmiCecConfig().setStringValue(
-                HdmiControlManager.CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP,
-                HdmiControlManager.SEND_STANDBY_ON_SLEEP_TO_TV);
+                HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE,
+                HdmiControlManager.POWER_CONTROL_MODE_TV);
         mHdmiControlService.oneTouchPlay(new IHdmiControlCallback.Stub() {
             @Override
             public void onComplete(int result) {
@@ -1164,8 +1164,8 @@ public class HdmiCecLocalDevicePlaybackTest {
     @Test
     public void oneTouchPlay_SendStandbyOnSleepBroadcast() {
         mHdmiCecLocalDevicePlayback.mService.getHdmiCecConfig().setStringValue(
-                HdmiControlManager.CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP,
-                HdmiControlManager.SEND_STANDBY_ON_SLEEP_BROADCAST);
+                HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE,
+                HdmiControlManager.POWER_CONTROL_MODE_BROADCAST);
         mHdmiControlService.oneTouchPlay(new IHdmiControlCallback.Stub() {
             @Override
             public void onComplete(int result) {
@@ -1187,8 +1187,8 @@ public class HdmiCecLocalDevicePlaybackTest {
     @Test
     public void oneTouchPlay_SendStandbyOnSleepNone() {
         mHdmiCecLocalDevicePlayback.mService.getHdmiCecConfig().setStringValue(
-                HdmiControlManager.CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP,
-                HdmiControlManager.SEND_STANDBY_ON_SLEEP_NONE);
+                HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE,
+                HdmiControlManager.POWER_CONTROL_MODE_NONE);
         mHdmiControlService.oneTouchPlay(new IHdmiControlCallback.Stub() {
             @Override
             public void onComplete(int result) {
@@ -1266,8 +1266,8 @@ public class HdmiCecLocalDevicePlaybackTest {
     @Test
     public void toggleAndFollowTvPower_ToTv_TvStatusOn() {
         mHdmiCecLocalDevicePlayback.mService.getHdmiCecConfig().setStringValue(
-                HdmiControlManager.CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP,
-                HdmiControlManager.SEND_STANDBY_ON_SLEEP_TO_TV);
+                HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE,
+                HdmiControlManager.POWER_CONTROL_MODE_TV);
         mStandby = false;
         mHdmiControlService.toggleAndFollowTvPower();
         HdmiCecMessage tvPowerStatus = HdmiCecMessageBuilder.buildReportPowerStatus(ADDR_TV,
@@ -1284,8 +1284,8 @@ public class HdmiCecLocalDevicePlaybackTest {
     @Test
     public void toggleAndFollowTvPower_Broadcast_TvStatusOn() {
         mHdmiCecLocalDevicePlayback.mService.getHdmiCecConfig().setStringValue(
-                HdmiControlManager.CEC_SETTING_NAME_SEND_STANDBY_ON_SLEEP,
-                HdmiControlManager.SEND_STANDBY_ON_SLEEP_BROADCAST);
+                HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE,
+                HdmiControlManager.POWER_CONTROL_MODE_BROADCAST);
         mStandby = false;
         mHdmiControlService.toggleAndFollowTvPower();
         HdmiCecMessage tvPowerStatus = HdmiCecMessageBuilder.buildReportPowerStatus(ADDR_TV,