diff --git a/MdePkg/Library/UefiDriverModelLib/UefiDriverModelLib.msa b/MdePkg/Library/UefiDriverModelLib/UefiDriverModelLib.msa
index 2fd144d097..3bcd9776b5 100644
--- a/MdePkg/Library/UefiDriverModelLib/UefiDriverModelLib.msa
+++ b/MdePkg/Library/UefiDriverModelLib/UefiDriverModelLib.msa
@@ -39,16 +39,16 @@
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
   </PackageDependencies>
   <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
+    <Protocol Usage="ALWAYS_PRODUCED">
       <ProtocolCName>gEfiDriverBindingProtocolGuid</ProtocolCName>
     </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
+    <Protocol Usage="SOMETIMES_CONSUMED">
       <ProtocolCName>gEfiComponentNameProtocolGuid</ProtocolCName>
     </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
+    <Protocol Usage="SOMETIMES_CONSUMED">
       <ProtocolCName>gEfiDriverConfigurationProtocolGuid</ProtocolCName>
     </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
+    <Protocol Usage="SOMETIMES_CONSUMED">
       <ProtocolCName>gEfiDriverDiagnosticsProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
diff --git a/MdePkg/MdePkg.spd b/MdePkg/MdePkg.spd
index 331ae70603..104b77f4de 100644
--- a/MdePkg/MdePkg.spd
+++ b/MdePkg/MdePkg.spd
@@ -1718,11 +1718,6 @@
       <GuidValue>1ACED566-76ED-4218-BC81-767F1F977A89</GuidValue>
       <HelpText/>
     </Entry>
-    <Entry Name="NetworkInterfaceIdentifier2">
-      <C_Name>gEfiNetworkInterfaceIdentifierProtocolGuid_31</C_Name>
-      <GuidValue>1ACED566-76ED-4218-BC81-767F1F977A89</GuidValue>
-      <HelpText/>
-    </Entry>
     <Entry Name="LoadedImage">
       <C_Name>gEfiLoadedImageProtocolGuid</C_Name>
       <GuidValue>5B1B31A1-9562-11D2-8E3F-00A0C969723B</GuidValue>