diff --git a/init.common.diag.rc.user b/init.common.diag.rc.user
index 65f6a3bf2..efdd8f0c1 100755
--- a/init.common.diag.rc.user
+++ b/init.common.diag.rc.user
@@ -2,3 +2,6 @@
 
 on property:ro.boot.mode=normal
     rm /dev/diag
+
+on boot
+    setprop persist.sys.usb.config diag,serial_cdev,serial_tty,rmnet_ipa,mass_storage
diff --git a/init.common.diag.rc.userdebug b/init.common.diag.rc.userdebug
index 25abea435..28196f927 100644
--- a/init.common.diag.rc.userdebug
+++ b/init.common.diag.rc.userdebug
@@ -17,3 +17,4 @@ on post-fs-data
 
 on boot
     chmod 666 /dev/diag
+    setprop persist.sys.usb.config diag,serial_cdev,serial_tty,rmnet_ipa,mass_storage,adb
diff --git a/init.common.usb.rc b/init.common.usb.rc
index e5206de8f..491791658 100644
--- a/init.common.usb.rc
+++ b/init.common.usb.rc
@@ -8,7 +8,6 @@ on boot
     write /sys/class/android_usb/android0/iProduct ${ro.product.model}
 
     write /sys/class/android_usb/f_mass_storage/lun/nofua 1
-    setprop persist.sys.usb.config diag,serial_cdev,serial_tty,rmnet_ipa,mass_storage,adb
 
     write /sys/class/android_usb/android0/f_rndis_qc/rndis_transports BAM2BAM_IPA
     write /sys/module/g_android/parameters/mtp_tx_req_len 131072