diff --git a/conf/init.gs201.usb.rc b/conf/init.gs201.usb.rc
index 597b25b5..be407742 100644
--- a/conf/init.gs201.usb.rc
+++ b/conf/init.gs201.usb.rc
@@ -43,8 +43,9 @@ on early-boot
     write /config/usb_gadget/g1/functions/rndis.gs4/class e0
     write /config/usb_gadget/g1/functions/rndis.gs4/subclass 01
     write /config/usb_gadget/g1/functions/rndis.gs4/protocol 03
+    write /config/usb_gadget/g1/functions/rndis.gs4/os_desc/interface.ncm/compatible_id RNDIS
     write /config/usb_gadget/g1/functions/rndis.gs4/ifname rndis%d
-    setprop vendor.usb.rndis.config ncm.gs9
+    setprop vendor.usb.rndis.config rndis.gs4
 
     # midi function
     mkdir /config/usb_gadget/g1/functions/midi.gs5
@@ -61,6 +62,7 @@ on early-boot
     # ncm function
     mkdir /config/usb_gadget/g1/functions/ncm.gs9
     write /config/usb_gadget/g1/functions/ncm.gs9/os_desc/interface.ncm/compatible_id WINNCM
+    write /config/usb_gadget/g1/functions/ncm.gs9/ifname ncm%d
 
     # etr_miu function
     mkdir /config/usb_gadget/g1/functions/etr_miu.gs11
diff --git a/usb/UsbGadget.cpp b/usb/UsbGadget.cpp
index 13426b7c..d8b4d0af 100644
--- a/usb/UsbGadget.cpp
+++ b/usb/UsbGadget.cpp
@@ -223,14 +223,12 @@ static V1_0::Status validateAndSetVidPid(uint64_t functions) {
         case static_cast<uint64_t>(GadgetFunction::NCM):
             if (!(vendorFunctions == "user" || vendorFunctions == ""))
                 ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str());
-            // TODO(b/170953147): need to request a new PID. Sharing PID of rndis now.
-            ret = setVidPid("0x18d1", "0x4ee3");
+            ret = setVidPid("0x18d1", "0x4eeb");
             break;
         case GadgetFunction::ADB | GadgetFunction::NCM:
             if (!(vendorFunctions == "user" || vendorFunctions == ""))
                 ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str());
-            // TODO(b/170953147): need to request a new PID. Sharing PID of rndis+adb now.
-            ret = setVidPid("0x18d1", "0x4ee4");
+            ret = setVidPid("0x18d1", "0x4eec");
             break;
         default:
             ALOGE("Combination not supported");