diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java
index 13b3076e6f1..07bd175e455 100644
--- a/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java
@@ -36,6 +36,7 @@ import com.android.settings.Utils;
  */
 public class UsbDetailsPowerRoleController extends UsbDetailsController
         implements OnPreferenceClickListener {
+    private static final String KEY_USB_USE_POWER_ONLY = "usb_use_power_only";
 
     private PreferenceCategory mPreferenceCategory;
     private SwitchPreference mSwitchPreference;
@@ -61,6 +62,7 @@ public class UsbDetailsPowerRoleController extends UsbDetailsController
         mPreferenceCategory = screen.findPreference(getPreferenceKey());
         mSwitchPreference = new SwitchPreference(mPreferenceCategory.getContext());
         mSwitchPreference.setTitle(R.string.usb_use_power_only);
+        mSwitchPreference.setKey(KEY_USB_USE_POWER_ONLY);
         mSwitchPreference.setOnPreferenceClickListener(this);
         mPreferenceCategory.addPreference(mSwitchPreference);
     }
diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsTranscodeMtpController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsTranscodeMtpController.java
index c4404992638..280e1d2cbab 100644
--- a/src/com/android/settings/connecteddevice/usb/UsbDetailsTranscodeMtpController.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsTranscodeMtpController.java
@@ -38,6 +38,7 @@ public class UsbDetailsTranscodeMtpController extends UsbDetailsController
         implements Preference.OnPreferenceClickListener {
     private static final String TRANSCODE_MTP_SYS_PROP_KEY = "sys.fuse.transcode_mtp";
     private static final String PREFERENCE_KEY = "usb_transcode_mtp";
+    private static final String KEY_USB_TRANSCODE_FILES = "usb_transcode_files";
 
     private PreferenceCategory mPreferenceCategory;
     private SwitchPreference mSwitchPreference;
@@ -54,6 +55,7 @@ public class UsbDetailsTranscodeMtpController extends UsbDetailsController
         mPreferenceCategory = screen.findPreference(getPreferenceKey());
         mSwitchPreference = new SwitchPreference(mPreferenceCategory.getContext());
         mSwitchPreference.setTitle(R.string.usb_transcode_files);
+        mSwitchPreference.setKey(KEY_USB_TRANSCODE_FILES);
         mSwitchPreference.setOnPreferenceClickListener(this);
         mSwitchPreference.setSummaryOn(R.string.usb_transcode_files_summary);
         mPreferenceCategory.addPreference(mSwitchPreference);