diff --git a/Common/MU b/Common/MU
index b748acbf5c..da051c707f 160000
--- a/Common/MU
+++ b/Common/MU
@@ -1 +1 @@
-Subproject commit b748acbf5cfd3b2221d03cc528c13fcdc33e2fb5
+Subproject commit da051c707f056617f8e10bf9f3cc5071bc504d83
diff --git a/Platforms/QemuQ35Pkg/Test/QemuQ35PkgHostTest.dsc b/Platforms/QemuQ35Pkg/Test/QemuQ35PkgHostTest.dsc
index 0c5533962b..e03abc1829 100644
--- a/Platforms/QemuQ35Pkg/Test/QemuQ35PkgHostTest.dsc
+++ b/Platforms/QemuQ35Pkg/Test/QemuQ35PkgHostTest.dsc
@@ -35,7 +35,7 @@
 
 [LibraryClasses]
   MfciPolicyParsingLib|MfciPkg/Private/Library/MfciPolicyParsingLibNull/MfciPolicyParsingLibNull.inf
-  MfciDeviceIdSupportLib|MfciPkg/Library/MfciDeviceIdSupportLibNull/MfciDeviceIdSupportLibNull.inf
+  MfciDeviceIdSupportLib|MfciPkg/Library/MfciDeviceIdSupportLibSmbios/MfciDeviceIdSupportLibSmbios.inf
   VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
   UefiLib|MdePkg/Library/UefiLib/UefiLib.inf
   UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
diff --git a/Platforms/QemuSbsaPkg/Test/QemuSbsaPkgHostTest.dsc b/Platforms/QemuSbsaPkg/Test/QemuSbsaPkgHostTest.dsc
index 1c2ce2b5a7..d18ab67c64 100644
--- a/Platforms/QemuSbsaPkg/Test/QemuSbsaPkgHostTest.dsc
+++ b/Platforms/QemuSbsaPkg/Test/QemuSbsaPkgHostTest.dsc
@@ -35,7 +35,7 @@
 
 [LibraryClasses]
   MfciPolicyParsingLib|MfciPkg/Private/Library/MfciPolicyParsingLibNull/MfciPolicyParsingLibNull.inf
-  MfciDeviceIdSupportLib|MfciPkg/Library/MfciDeviceIdSupportLibNull/MfciDeviceIdSupportLibNull.inf
+  MfciDeviceIdSupportLib|MfciPkg/Library/MfciDeviceIdSupportLibSmbios/MfciDeviceIdSupportLibSmbios.inf
   VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
   UefiLib|MdePkg/Library/UefiLib/UefiLib.inf
   UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf