diff --git a/services/core/java/com/android/server/hdmi/HdmiCecConfig.java b/services/core/java/com/android/server/hdmi/HdmiCecConfig.java
index 8d42a909978e3..2374ece1dd65b 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecConfig.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecConfig.java
@@ -92,7 +92,7 @@ public class HdmiCecConfig {
 
     @NonNull private final Context mContext;
     @NonNull private final StorageAdapter mStorageAdapter;
-    @Nullable private final CecSettings mSystemConfig;
+    @Nullable private final CecSettings mProductConfig;
     @Nullable private final CecSettings mVendorOverride;
 
     private final ArrayMap<Setting, Set<SettingChangeListener>>
@@ -198,14 +198,14 @@ public class HdmiCecConfig {
     @VisibleForTesting
     HdmiCecConfig(@NonNull Context context,
                   @NonNull StorageAdapter storageAdapter,
-                  @Nullable CecSettings systemConfig,
+                  @Nullable CecSettings productConfig,
                   @Nullable CecSettings vendorOverride) {
         mContext = context;
         mStorageAdapter = storageAdapter;
-        mSystemConfig = systemConfig;
+        mProductConfig = productConfig;
         mVendorOverride = vendorOverride;
-        if (mSystemConfig == null) {
-            Slog.i(TAG, "CEC system configuration XML missing.");
+        if (mProductConfig == null) {
+            Slog.i(TAG, "CEC master configuration XML missing.");
         }
         if (mVendorOverride == null) {
             Slog.i(TAG, "CEC OEM configuration override XML missing.");
@@ -214,7 +214,7 @@ public class HdmiCecConfig {
 
     HdmiCecConfig(@NonNull Context context) {
         this(context, new StorageAdapter(context),
-             readSettingsFromFile(Environment.buildPath(Environment.getRootDirectory(),
+             readSettingsFromFile(Environment.buildPath(Environment.getProductDirectory(),
                                                         ETC_DIR, CONFIG_FILE)),
              readSettingsFromFile(Environment.buildPath(Environment.getVendorDirectory(),
                                                         ETC_DIR, CONFIG_FILE)));
@@ -241,14 +241,14 @@ public class HdmiCecConfig {
     @VisibleForTesting
     static HdmiCecConfig createFromStrings(@NonNull Context context,
                                            @NonNull StorageAdapter storageAdapter,
-                                           @Nullable String systemConfigXml,
+                                           @Nullable String productConfigXml,
                                            @Nullable String vendorOverrideXml) {
-        CecSettings systemConfig = null;
+        CecSettings productConfig = null;
         CecSettings vendorOverride = null;
         try {
-            if (systemConfigXml != null) {
-                systemConfig = XmlParser.read(
-                        new ByteArrayInputStream(systemConfigXml.getBytes()));
+            if (productConfigXml != null) {
+                productConfig = XmlParser.read(
+                        new ByteArrayInputStream(productConfigXml.getBytes()));
             }
             if (vendorOverrideXml != null) {
                 vendorOverride = XmlParser.read(
@@ -257,12 +257,12 @@ public class HdmiCecConfig {
         } catch (IOException | DatatypeConfigurationException | XmlPullParserException e) {
             Slog.e(TAG, "Encountered an error while reading/parsing CEC config strings", e);
         }
-        return new HdmiCecConfig(context, storageAdapter, systemConfig, vendorOverride);
+        return new HdmiCecConfig(context, storageAdapter, productConfig, vendorOverride);
     }
 
     @Nullable
     private Setting getSetting(@NonNull String name) {
-        if (mSystemConfig == null) {
+        if (mProductConfig == null) {
             return null;
         }
         if (mVendorOverride != null) {
@@ -273,8 +273,8 @@ public class HdmiCecConfig {
                 }
             }
         }
-        // If not found, try the system config.
-        for (Setting setting : mSystemConfig.getSetting()) {
+        // If not found, try the product config.
+        for (Setting setting : mProductConfig.getSetting()) {
             if (setting.getName().equals(name)) {
                 return setting;
             }
@@ -456,11 +456,11 @@ public class HdmiCecConfig {
      * Returns a list of all settings based on the XML metadata.
      */
     public @CecSettingName List<String> getAllSettings() {
-        if (mSystemConfig == null) {
+        if (mProductConfig == null) {
             return new ArrayList<String>();
         }
         List<String> allSettings = new ArrayList<String>();
-        for (Setting setting : mSystemConfig.getSetting()) {
+        for (Setting setting : mProductConfig.getSetting()) {
             allSettings.add(setting.getName());
         }
         return allSettings;
@@ -470,12 +470,12 @@ public class HdmiCecConfig {
      * Returns a list of user-modifiable settings based on the XML metadata.
      */
     public @CecSettingName List<String> getUserSettings() {
-        if (mSystemConfig == null) {
+        if (mProductConfig == null) {
             return new ArrayList<String>();
         }
         Set<String> userSettings = new HashSet<String>();
-        // First read from the system config.
-        for (Setting setting : mSystemConfig.getSetting()) {
+        // First read from the product config.
+        for (Setting setting : mProductConfig.getSetting()) {
             if (setting.getUserConfigurable()) {
                 userSettings.add(setting.getName());
             }