diff --git a/MdeModulePkg/Application/HelloWorld/HelloWorld.uni b/MdeModulePkg/Application/HelloWorld/HelloWorld.uni
new file mode 100644
index 0000000000..78d882c24b
Binary files /dev/null and b/MdeModulePkg/Application/HelloWorld/HelloWorld.uni differ
diff --git a/MdeModulePkg/Application/HelloWorld/HelloWorldExtra.uni b/MdeModulePkg/Application/HelloWorld/HelloWorldExtra.uni
new file mode 100644
index 0000000000..c9ef65c371
Binary files /dev/null and b/MdeModulePkg/Application/HelloWorld/HelloWorldExtra.uni differ
diff --git a/MdeModulePkg/Application/VariableInfo/VariableInfo.uni b/MdeModulePkg/Application/VariableInfo/VariableInfo.uni
new file mode 100644
index 0000000000..665b454a10
Binary files /dev/null and b/MdeModulePkg/Application/VariableInfo/VariableInfo.uni differ
diff --git a/MdeModulePkg/Application/VariableInfo/VariableInfoExtra.uni b/MdeModulePkg/Application/VariableInfo/VariableInfoExtra.uni
new file mode 100644
index 0000000000..f23f161062
Binary files /dev/null and b/MdeModulePkg/Application/VariableInfo/VariableInfoExtra.uni differ
diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThruDxe.uni b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThruDxe.uni
new file mode 100644
index 0000000000..de96874df8
Binary files /dev/null and b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThruDxe.uni differ
diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThruDxeExtra.uni b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThruDxeExtra.uni
new file mode 100644
index 0000000000..d89350dfe3
Binary files /dev/null and b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThruDxeExtra.uni differ
diff --git a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.uni b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.uni
new file mode 100644
index 0000000000..6fc66da964
Binary files /dev/null and b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.uni differ
diff --git a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxeExtra.uni b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxeExtra.uni
new file mode 100644
index 0000000000..269bbf9780
Binary files /dev/null and b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxeExtra.uni differ
diff --git a/MdeModulePkg/Bus/I2c/I2cDxe/I2cBusDxe.uni b/MdeModulePkg/Bus/I2c/I2cDxe/I2cBusDxe.uni
new file mode 100644
index 0000000000..2cfac40aa2
Binary files /dev/null and b/MdeModulePkg/Bus/I2c/I2cDxe/I2cBusDxe.uni differ
diff --git a/MdeModulePkg/Bus/I2c/I2cDxe/I2cBusDxeExtra.uni b/MdeModulePkg/Bus/I2c/I2cDxe/I2cBusDxeExtra.uni
new file mode 100644
index 0000000000..13381e6282
Binary files /dev/null and b/MdeModulePkg/Bus/I2c/I2cDxe/I2cBusDxeExtra.uni differ
diff --git a/MdeModulePkg/Bus/I2c/I2cDxe/I2cDxe.uni b/MdeModulePkg/Bus/I2c/I2cDxe/I2cDxe.uni
new file mode 100644
index 0000000000..ec3aaf7cd8
Binary files /dev/null and b/MdeModulePkg/Bus/I2c/I2cDxe/I2cDxe.uni differ
diff --git a/MdeModulePkg/Bus/I2c/I2cDxe/I2cDxeExtra.uni b/MdeModulePkg/Bus/I2c/I2cDxe/I2cDxeExtra.uni
new file mode 100644
index 0000000000..9496661f9e
Binary files /dev/null and b/MdeModulePkg/Bus/I2c/I2cDxe/I2cDxeExtra.uni differ
diff --git a/MdeModulePkg/Bus/I2c/I2cDxe/I2cHostDxe.uni b/MdeModulePkg/Bus/I2c/I2cDxe/I2cHostDxe.uni
new file mode 100644
index 0000000000..c10d85e6dd
Binary files /dev/null and b/MdeModulePkg/Bus/I2c/I2cDxe/I2cHostDxe.uni differ
diff --git a/MdeModulePkg/Bus/I2c/I2cDxe/I2cHostDxeExtra.uni b/MdeModulePkg/Bus/I2c/I2cDxe/I2cHostDxeExtra.uni
new file mode 100644
index 0000000000..d1f60d4f09
Binary files /dev/null and b/MdeModulePkg/Bus/I2c/I2cDxe/I2cHostDxeExtra.uni differ
diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.uni b/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.uni
new file mode 100644
index 0000000000..90022e3430
Binary files /dev/null and b/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.uni differ
diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxeExtra.uni b/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxeExtra.uni
new file mode 100644
index 0000000000..0039424c15
Binary files /dev/null and b/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxeExtra.uni differ
diff --git a/MdeModulePkg/Bus/Pci/EhciPei/EhciPei.uni b/MdeModulePkg/Bus/Pci/EhciPei/EhciPei.uni
new file mode 100644
index 0000000000..647c9497e9
Binary files /dev/null and b/MdeModulePkg/Bus/Pci/EhciPei/EhciPei.uni differ
diff --git a/MdeModulePkg/Bus/Pci/EhciPei/EhciPeiExtra.uni b/MdeModulePkg/Bus/Pci/EhciPei/EhciPeiExtra.uni
new file mode 100644
index 0000000000..3f5163896d
Binary files /dev/null and b/MdeModulePkg/Bus/Pci/EhciPei/EhciPeiExtra.uni differ
diff --git a/MdeModulePkg/Bus/Pci/IdeBusPei/IdeBusPei.uni b/MdeModulePkg/Bus/Pci/IdeBusPei/IdeBusPei.uni
new file mode 100644
index 0000000000..c44024bddb
Binary files /dev/null and b/MdeModulePkg/Bus/Pci/IdeBusPei/IdeBusPei.uni differ
diff --git a/MdeModulePkg/Bus/Pci/IdeBusPei/IdeBusPeiExtra.uni b/MdeModulePkg/Bus/Pci/IdeBusPei/IdeBusPeiExtra.uni
new file mode 100644
index 0000000000..ec4663cf91
Binary files /dev/null and b/MdeModulePkg/Bus/Pci/IdeBusPei/IdeBusPeiExtra.uni differ
diff --git a/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.uni b/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.uni
new file mode 100644
index 0000000000..6fb6db624c
Binary files /dev/null and b/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.uni differ
diff --git a/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupportExtra.uni b/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupportExtra.uni
new file mode 100644
index 0000000000..0a3aaac3da
Binary files /dev/null and b/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupportExtra.uni differ
diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.uni b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.uni
new file mode 100644
index 0000000000..4195c3d932
Binary files /dev/null and b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.uni differ
diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxeExtra.uni b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxeExtra.uni
new file mode 100644
index 0000000000..2f8bf5922d
Binary files /dev/null and b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxeExtra.uni differ
diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.uni b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.uni
new file mode 100644
index 0000000000..7d93e796e9
Binary files /dev/null and b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.uni differ
diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxeExtra.uni b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxeExtra.uni
new file mode 100644
index 0000000000..63eff41a74
Binary files /dev/null and b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxeExtra.uni differ
diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.uni b/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.uni
new file mode 100644
index 0000000000..e5a22a80db
Binary files /dev/null and b/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.uni differ
diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxeExtra.uni b/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxeExtra.uni
new file mode 100644
index 0000000000..71d9f6cf77
Binary files /dev/null and b/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxeExtra.uni differ
diff --git a/MdeModulePkg/Bus/Pci/UhciPei/UhciPei.uni b/MdeModulePkg/Bus/Pci/UhciPei/UhciPei.uni
new file mode 100644
index 0000000000..415430ca48
Binary files /dev/null and b/MdeModulePkg/Bus/Pci/UhciPei/UhciPei.uni differ
diff --git a/MdeModulePkg/Bus/Pci/UhciPei/UhciPeiExtra.uni b/MdeModulePkg/Bus/Pci/UhciPei/UhciPeiExtra.uni
new file mode 100644
index 0000000000..5cde35591a
Binary files /dev/null and b/MdeModulePkg/Bus/Pci/UhciPei/UhciPeiExtra.uni differ
diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.uni b/MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.uni
new file mode 100644
index 0000000000..a5050817c9
Binary files /dev/null and b/MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.uni differ
diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciDxeExtra.uni b/MdeModulePkg/Bus/Pci/XhciDxe/XhciDxeExtra.uni
new file mode 100644
index 0000000000..9c598b1868
Binary files /dev/null and b/MdeModulePkg/Bus/Pci/XhciDxe/XhciDxeExtra.uni differ
diff --git a/MdeModulePkg/Bus/Pci/XhciPei/XhciPei.uni b/MdeModulePkg/Bus/Pci/XhciPei/XhciPei.uni
new file mode 100644
index 0000000000..82bcc64fdb
Binary files /dev/null and b/MdeModulePkg/Bus/Pci/XhciPei/XhciPei.uni differ
diff --git a/MdeModulePkg/Bus/Pci/XhciPei/XhciPeiExtra.uni b/MdeModulePkg/Bus/Pci/XhciPei/XhciPeiExtra.uni
new file mode 100644
index 0000000000..d977f2f8c2
Binary files /dev/null and b/MdeModulePkg/Bus/Pci/XhciPei/XhciPeiExtra.uni differ
diff --git a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.uni b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.uni
new file mode 100644
index 0000000000..d186f67cd9
Binary files /dev/null and b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.uni differ
diff --git a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusExtra.uni b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusExtra.uni
new file mode 100644
index 0000000000..420965e83d
Binary files /dev/null and b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusExtra.uni differ
diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.uni b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.uni
new file mode 100644
index 0000000000..f8d78e552a
Binary files /dev/null and b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.uni differ
diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskExtra.uni b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskExtra.uni
new file mode 100644
index 0000000000..0cb5610ce5
Binary files /dev/null and b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskExtra.uni differ
diff --git a/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.uni b/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.uni
new file mode 100644
index 0000000000..5a18865cbc
Binary files /dev/null and b/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.uni differ
diff --git a/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPeiExtra.uni b/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPeiExtra.uni
new file mode 100644
index 0000000000..2e2cdf5a7b
Binary files /dev/null and b/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPeiExtra.uni differ
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.uni b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.uni
new file mode 100644
index 0000000000..c54fbaffd4
Binary files /dev/null and b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.uni differ
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxeExtra.uni b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxeExtra.uni
new file mode 100644
index 0000000000..305ab09c3e
Binary files /dev/null and b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxeExtra.uni differ
diff --git a/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.uni b/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.uni
new file mode 100644
index 0000000000..428ad69eb0
Binary files /dev/null and b/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.uni differ
diff --git a/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPeiExtra.uni b/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPeiExtra.uni
new file mode 100644
index 0000000000..3520fdba45
Binary files /dev/null and b/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPeiExtra.uni differ
diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.uni b/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.uni
new file mode 100644
index 0000000000..6478246a22
Binary files /dev/null and b/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.uni differ
diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxeExtra.uni b/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxeExtra.uni
new file mode 100644
index 0000000000..b337726abf
Binary files /dev/null and b/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxeExtra.uni differ
diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.uni b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.uni
new file mode 100644
index 0000000000..10f8c399e5
Binary files /dev/null and b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.uni differ
diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxeExtra.uni b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxeExtra.uni
new file mode 100644
index 0000000000..7603d47e39
Binary files /dev/null and b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxeExtra.uni differ
diff --git a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.uni b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.uni
new file mode 100644
index 0000000000..1228c1c4bc
Binary files /dev/null and b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.uni differ
diff --git a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxeExtra.uni b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxeExtra.uni
new file mode 100644
index 0000000000..763dcaed03
Binary files /dev/null and b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxeExtra.uni differ
diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.uni b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.uni
new file mode 100644
index 0000000000..a2f3868b07
Binary files /dev/null and b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.uni differ
diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxeExtra.uni b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxeExtra.uni
new file mode 100644
index 0000000000..6aab5aaa10
Binary files /dev/null and b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxeExtra.uni differ
diff --git a/MdeModulePkg/Core/Dxe/DxeCore.uni b/MdeModulePkg/Core/Dxe/DxeCore.uni
new file mode 100644
index 0000000000..118ebd4695
Binary files /dev/null and b/MdeModulePkg/Core/Dxe/DxeCore.uni differ
diff --git a/MdeModulePkg/Core/Dxe/DxeCoreExtra.uni b/MdeModulePkg/Core/Dxe/DxeCoreExtra.uni
new file mode 100644
index 0000000000..094ad27f07
Binary files /dev/null and b/MdeModulePkg/Core/Dxe/DxeCoreExtra.uni differ
diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.uni b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.uni
new file mode 100644
index 0000000000..ad7f202f51
Binary files /dev/null and b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.uni differ
diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIplExtra.uni b/MdeModulePkg/Core/DxeIplPeim/DxeIplExtra.uni
new file mode 100644
index 0000000000..ec8cebc428
Binary files /dev/null and b/MdeModulePkg/Core/DxeIplPeim/DxeIplExtra.uni differ
diff --git a/MdeModulePkg/Core/Pei/PeiCore.uni b/MdeModulePkg/Core/Pei/PeiCore.uni
new file mode 100644
index 0000000000..309f8c3c31
Binary files /dev/null and b/MdeModulePkg/Core/Pei/PeiCore.uni differ
diff --git a/MdeModulePkg/Core/Pei/PeiCoreExtra.uni b/MdeModulePkg/Core/Pei/PeiCoreExtra.uni
new file mode 100644
index 0000000000..f01d0e307a
Binary files /dev/null and b/MdeModulePkg/Core/Pei/PeiCoreExtra.uni differ
diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.uni b/MdeModulePkg/Core/PiSmmCore/PiSmmCore.uni
new file mode 100644
index 0000000000..59f04db4bb
Binary files /dev/null and b/MdeModulePkg/Core/PiSmmCore/PiSmmCore.uni differ
diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmCoreExtra.uni b/MdeModulePkg/Core/PiSmmCore/PiSmmCoreExtra.uni
new file mode 100644
index 0000000000..5faa16de92
Binary files /dev/null and b/MdeModulePkg/Core/PiSmmCore/PiSmmCoreExtra.uni differ
diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.uni b/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.uni
new file mode 100644
index 0000000000..c50a46be6c
Binary files /dev/null and b/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.uni differ
diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmIplExtra.uni b/MdeModulePkg/Core/PiSmmCore/PiSmmIplExtra.uni
new file mode 100644
index 0000000000..352b7722fc
Binary files /dev/null and b/MdeModulePkg/Core/PiSmmCore/PiSmmIplExtra.uni differ
diff --git a/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.uni b/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.uni
new file mode 100644
index 0000000000..c029c2e35c
Binary files /dev/null and b/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.uni differ
diff --git a/MdeModulePkg/Core/RuntimeDxe/RuntimeDxeExtra.uni b/MdeModulePkg/Core/RuntimeDxe/RuntimeDxeExtra.uni
new file mode 100644
index 0000000000..4049b83022
Binary files /dev/null and b/MdeModulePkg/Core/RuntimeDxe/RuntimeDxeExtra.uni differ
diff --git a/MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.uni b/MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.uni
new file mode 100644
index 0000000000..7095900244
Binary files /dev/null and b/MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.uni differ
diff --git a/MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.uni b/MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.uni
new file mode 100644
index 0000000000..2142e4febb
Binary files /dev/null and b/MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.uni differ
diff --git a/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.uni b/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.uni
index 98c5897e1e..71209452ab 100644
Binary files a/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.uni and b/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.uni differ
diff --git a/MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.uni b/MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.uni
new file mode 100644
index 0000000000..b48b46f89e
Binary files /dev/null and b/MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.uni differ
diff --git a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLibModStrs.uni b/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLibModStrs.uni
new file mode 100644
index 0000000000..64046df4c0
Binary files /dev/null and b/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLibModStrs.uni differ
diff --git a/MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.uni b/MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.uni
new file mode 100644
index 0000000000..1f78451662
Binary files /dev/null and b/MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.uni differ
diff --git a/MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.uni b/MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.uni
new file mode 100644
index 0000000000..3eb438ebcb
Binary files /dev/null and b/MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.uni differ
diff --git a/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.uni b/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.uni
new file mode 100644
index 0000000000..b033546aaf
Binary files /dev/null and b/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.uni differ
diff --git a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.uni b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.uni
new file mode 100644
index 0000000000..8ac91cd364
Binary files /dev/null and b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.uni differ
diff --git a/MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.uni b/MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.uni
new file mode 100644
index 0000000000..776a7422fd
Binary files /dev/null and b/MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.uni differ
diff --git a/MdeModulePkg/Library/DxeDebugPrintErrorLevelLib/DxeDebugPrintErrorLevelLib.uni b/MdeModulePkg/Library/DxeDebugPrintErrorLevelLib/DxeDebugPrintErrorLevelLib.uni
new file mode 100644
index 0000000000..d7a62bc74c
Binary files /dev/null and b/MdeModulePkg/Library/DxeDebugPrintErrorLevelLib/DxeDebugPrintErrorLevelLib.uni differ
diff --git a/MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.uni b/MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.uni
new file mode 100644
index 0000000000..12c9ddab4d
Binary files /dev/null and b/MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.uni differ
diff --git a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.uni b/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.uni
new file mode 100644
index 0000000000..d5aa026e65
Binary files /dev/null and b/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.uni differ
diff --git a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.uni b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.uni
new file mode 100644
index 0000000000..4ebafe98d7
Binary files /dev/null and b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.uni differ
diff --git a/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.uni b/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.uni
new file mode 100644
index 0000000000..695d1d76f7
Binary files /dev/null and b/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.uni differ
diff --git a/MdeModulePkg/Library/DxePrintLibPrint2Protocol/DxePrintLibPrint2Protocol.uni b/MdeModulePkg/Library/DxePrintLibPrint2Protocol/DxePrintLibPrint2Protocol.uni
new file mode 100644
index 0000000000..f5f6031445
Binary files /dev/null and b/MdeModulePkg/Library/DxePrintLibPrint2Protocol/DxePrintLibPrint2Protocol.uni differ
diff --git a/MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.uni b/MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.uni
new file mode 100644
index 0000000000..57635f7e52
Binary files /dev/null and b/MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.uni differ
diff --git a/MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.uni b/MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.uni
new file mode 100644
index 0000000000..84a049e260
Binary files /dev/null and b/MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.uni differ
diff --git a/MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerformanceLib.uni b/MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerformanceLib.uni
new file mode 100644
index 0000000000..43bcc4eff7
Binary files /dev/null and b/MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerformanceLib.uni differ
diff --git a/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.uni b/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.uni
new file mode 100644
index 0000000000..6c2ba28b2b
Binary files /dev/null and b/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.uni differ
diff --git a/MdeModulePkg/Library/DxeUdpIoLib/DxeUpdIoLib.uni b/MdeModulePkg/Library/DxeUdpIoLib/DxeUpdIoLib.uni
new file mode 100644
index 0000000000..8113816a83
Binary files /dev/null and b/MdeModulePkg/Library/DxeUdpIoLib/DxeUpdIoLib.uni differ
diff --git a/MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.uni b/MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.uni
new file mode 100644
index 0000000000..be385807d0
Binary files /dev/null and b/MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.uni differ
diff --git a/MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.uni b/MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.uni
new file mode 100644
index 0000000000..6bbf7413fa
Binary files /dev/null and b/MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.uni differ
diff --git a/MdeModulePkg/Library/PeiCrc32GuidedSectionExtractLib/PeiCrc32GuidedSectionExtractLib.uni b/MdeModulePkg/Library/PeiCrc32GuidedSectionExtractLib/PeiCrc32GuidedSectionExtractLib.uni
index 6c4ec2290d..db67a79229 100644
Binary files a/MdeModulePkg/Library/PeiCrc32GuidedSectionExtractLib/PeiCrc32GuidedSectionExtractLib.uni and b/MdeModulePkg/Library/PeiCrc32GuidedSectionExtractLib/PeiCrc32GuidedSectionExtractLib.uni differ
diff --git a/MdeModulePkg/Library/PeiDebugPrintHobLib/PeiDebugPrintHobLib.uni b/MdeModulePkg/Library/PeiDebugPrintHobLib/PeiDebugPrintHobLib.uni
new file mode 100644
index 0000000000..acf4d3a3ba
Binary files /dev/null and b/MdeModulePkg/Library/PeiDebugPrintHobLib/PeiDebugPrintHobLib.uni differ
diff --git a/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.uni b/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.uni
new file mode 100644
index 0000000000..2e2408be67
Binary files /dev/null and b/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.uni differ
diff --git a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.uni b/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.uni
new file mode 100644
index 0000000000..b9ae989808
Binary files /dev/null and b/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.uni differ
diff --git a/MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.uni b/MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.uni
new file mode 100644
index 0000000000..ee6ae282f6
Binary files /dev/null and b/MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.uni differ
diff --git a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.uni b/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.uni
new file mode 100644
index 0000000000..aeb4c55516
Binary files /dev/null and b/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.uni differ
diff --git a/MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.uni b/MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.uni
new file mode 100644
index 0000000000..d8ab3e8b08
Binary files /dev/null and b/MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.uni differ
diff --git a/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationLib.uni b/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationLib.uni
new file mode 100644
index 0000000000..eeceeb2e99
Binary files /dev/null and b/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationLib.uni differ
diff --git a/MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.uni b/MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.uni
new file mode 100644
index 0000000000..7a563006ad
Binary files /dev/null and b/MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.uni differ
diff --git a/MdeModulePkg/Library/PlatformHookLibSerialPortPpi/PlatformHookLibSerialPortPpi.uni b/MdeModulePkg/Library/PlatformHookLibSerialPortPpi/PlatformHookLibSerialPortPpi.uni
index fa5a1a830b..a50f8e5b0d 100644
Binary files a/MdeModulePkg/Library/PlatformHookLibSerialPortPpi/PlatformHookLibSerialPortPpi.uni and b/MdeModulePkg/Library/PlatformHookLibSerialPortPpi/PlatformHookLibSerialPortPpi.uni differ
diff --git a/MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.uni b/MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.uni
new file mode 100644
index 0000000000..f192f9922e
Binary files /dev/null and b/MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.uni differ
diff --git a/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.uni b/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.uni
new file mode 100644
index 0000000000..144da8c52b
Binary files /dev/null and b/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.uni differ
diff --git a/MdeModulePkg/Library/SmmCorePlatformHookLibNull/SmmCorePlatformHookLibNull.uni b/MdeModulePkg/Library/SmmCorePlatformHookLibNull/SmmCorePlatformHookLibNull.uni
new file mode 100644
index 0000000000..f3e8d7f77e
Binary files /dev/null and b/MdeModulePkg/Library/SmmCorePlatformHookLibNull/SmmCorePlatformHookLibNull.uni differ
diff --git a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.uni b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.uni
new file mode 100644
index 0000000000..3fe3cd3a91
Binary files /dev/null and b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.uni differ
diff --git a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.uni b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.uni
new file mode 100644
index 0000000000..0d53524b74
Binary files /dev/null and b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.uni differ
diff --git a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.uni b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.uni
new file mode 100644
index 0000000000..f6cb4a1a56
Binary files /dev/null and b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.uni differ
diff --git a/MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.uni b/MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.uni
new file mode 100644
index 0000000000..a27fa76dd5
Binary files /dev/null and b/MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.uni differ
diff --git a/MdeModulePkg/Library/SmmReportStatusCodeLib/SmmReportStatusCodeLib.uni b/MdeModulePkg/Library/SmmReportStatusCodeLib/SmmReportStatusCodeLib.uni
new file mode 100644
index 0000000000..5c44bb11a9
Binary files /dev/null and b/MdeModulePkg/Library/SmmReportStatusCodeLib/SmmReportStatusCodeLib.uni differ
diff --git a/MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.uni b/MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.uni
new file mode 100644
index 0000000000..cb6e39fc82
Binary files /dev/null and b/MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.uni differ
diff --git a/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.uni b/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.uni
new file mode 100644
index 0000000000..4fa721b210
Binary files /dev/null and b/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.uni differ
diff --git a/MdeModulePkg/Logo/Logo.uni b/MdeModulePkg/Logo/Logo.uni
new file mode 100644
index 0000000000..ac2691d8d6
Binary files /dev/null and b/MdeModulePkg/Logo/Logo.uni differ
diff --git a/MdeModulePkg/Logo/LogoExtra.uni b/MdeModulePkg/Logo/LogoExtra.uni
new file mode 100644
index 0000000000..8b27ec593a
Binary files /dev/null and b/MdeModulePkg/Logo/LogoExtra.uni differ
diff --git a/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.uni b/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.uni
new file mode 100644
index 0000000000..0ac3ad9a32
Binary files /dev/null and b/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.uni differ
diff --git a/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformExtra.uni b/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformExtra.uni
new file mode 100644
index 0000000000..613bba3117
Binary files /dev/null and b/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformExtra.uni differ
diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.uni b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.uni
new file mode 100644
index 0000000000..c793565cdc
Binary files /dev/null and b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.uni differ
diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxeExtra.uni b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxeExtra.uni
new file mode 100644
index 0000000000..27355aa983
Binary files /dev/null and b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.uni b/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.uni
new file mode 100644
index 0000000000..93cd499aa7
Binary files /dev/null and b/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.uni differ
diff --git a/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxeExtra.uni b/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxeExtra.uni
new file mode 100644
index 0000000000..9a3921d580
Binary files /dev/null and b/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.uni b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.uni
new file mode 100644
index 0000000000..d61bb449d7
Binary files /dev/null and b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.uni differ
diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxeExtra.uni b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxeExtra.uni
new file mode 100644
index 0000000000..135270d842
Binary files /dev/null and b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.uni b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.uni
new file mode 100644
index 0000000000..a4bbcb3773
Binary files /dev/null and b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.uni differ
diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxeExtra.uni b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxeExtra.uni
new file mode 100644
index 0000000000..a39550b9df
Binary files /dev/null and b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.uni b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.uni
new file mode 100644
index 0000000000..c48b9a808e
Binary files /dev/null and b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.uni differ
diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePeiExtra.uni b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePeiExtra.uni
new file mode 100644
index 0000000000..3412a0ed1a
Binary files /dev/null and b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePeiExtra.uni differ
diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.uni b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.uni
new file mode 100644
index 0000000000..914aff4b13
Binary files /dev/null and b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.uni differ
diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmmExtra.uni b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmmExtra.uni
new file mode 100644
index 0000000000..60acf9799e
Binary files /dev/null and b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmmExtra.uni differ
diff --git a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.uni b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.uni
new file mode 100644
index 0000000000..351634a0d6
Binary files /dev/null and b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.uni differ
diff --git a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxeExtra.uni b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxeExtra.uni
new file mode 100644
index 0000000000..0007d0ca71
Binary files /dev/null and b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.uni b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.uni
new file mode 100644
index 0000000000..27cbaeb888
Binary files /dev/null and b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.uni differ
diff --git a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveStateExtra.uni b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveStateExtra.uni
new file mode 100644
index 0000000000..11a636c144
Binary files /dev/null and b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveStateExtra.uni differ
diff --git a/MdeModulePkg/Universal/CapsulePei/CapsulePei.uni b/MdeModulePkg/Universal/CapsulePei/CapsulePei.uni
new file mode 100644
index 0000000000..6082ef9710
Binary files /dev/null and b/MdeModulePkg/Universal/CapsulePei/CapsulePei.uni differ
diff --git a/MdeModulePkg/Universal/CapsulePei/CapsulePeiExtra.uni b/MdeModulePkg/Universal/CapsulePei/CapsulePeiExtra.uni
new file mode 100644
index 0000000000..871be9b513
Binary files /dev/null and b/MdeModulePkg/Universal/CapsulePei/CapsulePeiExtra.uni differ
diff --git a/MdeModulePkg/Universal/CapsulePei/CapsuleX64.uni b/MdeModulePkg/Universal/CapsulePei/CapsuleX64.uni
new file mode 100644
index 0000000000..f0f85471aa
Binary files /dev/null and b/MdeModulePkg/Universal/CapsulePei/CapsuleX64.uni differ
diff --git a/MdeModulePkg/Universal/CapsulePei/CapsuleX64Extra.uni b/MdeModulePkg/Universal/CapsulePei/CapsuleX64Extra.uni
new file mode 100644
index 0000000000..88d5e2057c
Binary files /dev/null and b/MdeModulePkg/Universal/CapsulePei/CapsuleX64Extra.uni differ
diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.uni b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.uni
new file mode 100644
index 0000000000..7acc6f4e0d
Binary files /dev/null and b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.uni differ
diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxeExtra.uni b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxeExtra.uni
new file mode 100644
index 0000000000..a9d83883eb
Binary files /dev/null and b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.uni b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.uni
new file mode 100644
index 0000000000..a931183cb8
Binary files /dev/null and b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.uni differ
diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxeExtra.uni b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxeExtra.uni
new file mode 100644
index 0000000000..1e1cc7ec6c
Binary files /dev/null and b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.uni b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.uni
new file mode 100644
index 0000000000..686542a6c8
Binary files /dev/null and b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.uni differ
diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxeExtra.uni b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxeExtra.uni
new file mode 100644
index 0000000000..86515ff49d
Binary files /dev/null and b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.uni b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.uni
new file mode 100644
index 0000000000..ce4ef9054b
Binary files /dev/null and b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.uni differ
diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxeExtra.uni b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxeExtra.uni
new file mode 100644
index 0000000000..49dfb5c8da
Binary files /dev/null and b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.uni b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.uni
new file mode 100644
index 0000000000..d05928a14f
Binary files /dev/null and b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.uni differ
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxeExtra.uni b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxeExtra.uni
new file mode 100644
index 0000000000..c26e92b060
Binary files /dev/null and b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxe.uni b/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxe.uni
new file mode 100644
index 0000000000..0637893661
Binary files /dev/null and b/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxe.uni differ
diff --git a/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxeExtra.uni b/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxeExtra.uni
new file mode 100644
index 0000000000..597a2cf137
Binary files /dev/null and b/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.uni b/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.uni
new file mode 100644
index 0000000000..3f329032d0
Binary files /dev/null and b/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.uni differ
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxeExtra.uni b/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxeExtra.uni
new file mode 100644
index 0000000000..5e49ee0140
Binary files /dev/null and b/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.uni b/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.uni
new file mode 100644
index 0000000000..4fc4ad760a
Binary files /dev/null and b/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.uni differ
diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxeExtra.uni b/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxeExtra.uni
new file mode 100644
index 0000000000..bb94010999
Binary files /dev/null and b/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.uni b/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.uni
new file mode 100644
index 0000000000..d32da62f5f
Binary files /dev/null and b/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.uni differ
diff --git a/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPeiExtra.uni b/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPeiExtra.uni
new file mode 100644
index 0000000000..b76d2a6e79
Binary files /dev/null and b/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPeiExtra.uni differ
diff --git a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.uni b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.uni
new file mode 100644
index 0000000000..475c1c82a8
Binary files /dev/null and b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.uni differ
diff --git a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxeExtra.uni b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxeExtra.uni
new file mode 100644
index 0000000000..7a2a1b84e3
Binary files /dev/null and b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.uni b/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.uni
new file mode 100644
index 0000000000..45ff3b8f84
Binary files /dev/null and b/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.uni differ
diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxeExtra.uni b/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxeExtra.uni
new file mode 100644
index 0000000000..a9b13695a9
Binary files /dev/null and b/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.uni b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.uni
new file mode 100644
index 0000000000..231d7acd8e
Binary files /dev/null and b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.uni differ
diff --git a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxeExtra.uni b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxeExtra.uni
new file mode 100644
index 0000000000..1ec5c4c3f9
Binary files /dev/null and b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngine.uni b/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngine.uni
new file mode 100644
index 0000000000..11b56ce661
Binary files /dev/null and b/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngine.uni differ
diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineExtra.uni b/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineExtra.uni
new file mode 100644
index 0000000000..31b4ae2f1c
Binary files /dev/null and b/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineExtra.uni differ
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.uni b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.uni
new file mode 100644
index 0000000000..728818ce2f
Binary files /dev/null and b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.uni differ
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleExtra.uni b/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleExtra.uni
new file mode 100644
index 0000000000..b97d184964
Binary files /dev/null and b/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleExtra.uni differ
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni b/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni
index 3f2690008e..05dba38b9e 100644
Binary files a/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni and b/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni differ
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDxe.uni b/MdeModulePkg/Universal/EbcDxe/EbcDxe.uni
new file mode 100644
index 0000000000..723a7ee2d8
Binary files /dev/null and b/MdeModulePkg/Universal/EbcDxe/EbcDxe.uni differ
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDxeExtra.uni b/MdeModulePkg/Universal/EbcDxe/EbcDxeExtra.uni
new file mode 100644
index 0000000000..6a8adee72d
Binary files /dev/null and b/MdeModulePkg/Universal/EbcDxe/EbcDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.uni b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.uni
new file mode 100644
index 0000000000..9e67eb0d51
Binary files /dev/null and b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.uni differ
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxeExtra.uni b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxeExtra.uni
new file mode 100644
index 0000000000..d4135ffab3
Binary files /dev/null and b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.uni b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.uni
new file mode 100644
index 0000000000..b33747c2c2
Binary files /dev/null and b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.uni differ
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxeExtra.uni b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxeExtra.uni
new file mode 100644
index 0000000000..6b0a8f99fd
Binary files /dev/null and b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/SmmFaultTolerantWriteDxe.uni b/MdeModulePkg/Universal/FaultTolerantWriteDxe/SmmFaultTolerantWriteDxe.uni
new file mode 100644
index 0000000000..f1fbf972a8
Binary files /dev/null and b/MdeModulePkg/Universal/FaultTolerantWriteDxe/SmmFaultTolerantWriteDxe.uni differ
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/SmmFaultTolerantWriteDxeExtra.uni b/MdeModulePkg/Universal/FaultTolerantWriteDxe/SmmFaultTolerantWriteDxeExtra.uni
new file mode 100644
index 0000000000..54aec337c5
Binary files /dev/null and b/MdeModulePkg/Universal/FaultTolerantWriteDxe/SmmFaultTolerantWriteDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.uni b/MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.uni
new file mode 100644
index 0000000000..1f3361820f
Binary files /dev/null and b/MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.uni differ
diff --git a/MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePeiExtra.uni b/MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePeiExtra.uni
new file mode 100644
index 0000000000..d13ce532aa
Binary files /dev/null and b/MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePeiExtra.uni differ
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.uni b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.uni
new file mode 100644
index 0000000000..ba8127d171
Binary files /dev/null and b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.uni differ
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseExtra.uni b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseExtra.uni
new file mode 100644
index 0000000000..d9687316dc
Binary files /dev/null and b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseExtra.uni differ
diff --git a/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSample.uni b/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSample.uni
new file mode 100644
index 0000000000..7ad63f4ad9
Binary files /dev/null and b/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSample.uni differ
diff --git a/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSampleExtra.uni b/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSampleExtra.uni
new file mode 100644
index 0000000000..63969d3e31
Binary files /dev/null and b/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSampleExtra.uni differ
diff --git a/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2Dxe.uni b/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2Dxe.uni
new file mode 100644
index 0000000000..18b5509e3e
Binary files /dev/null and b/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2Dxe.uni differ
diff --git a/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2DxeExtra.uni b/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2DxeExtra.uni
new file mode 100644
index 0000000000..0d1d0b8fcc
Binary files /dev/null and b/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2DxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.uni b/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.uni
new file mode 100644
index 0000000000..fb45ed9a8d
Binary files /dev/null and b/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.uni differ
diff --git a/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBoxExtra.uni b/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBoxExtra.uni
new file mode 100644
index 0000000000..ebc5a0d139
Binary files /dev/null and b/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBoxExtra.uni differ
diff --git a/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTestDxe.uni b/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTestDxe.uni
new file mode 100644
index 0000000000..5fad58be11
Binary files /dev/null and b/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTestDxe.uni differ
diff --git a/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTestDxeExtra.uni b/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTestDxeExtra.uni
new file mode 100644
index 0000000000..0f03bb7a9a
Binary files /dev/null and b/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTestDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.uni b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.uni
new file mode 100644
index 0000000000..0ede566a31
Binary files /dev/null and b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.uni differ
diff --git a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxeExtra.uni b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxeExtra.uni
new file mode 100644
index 0000000000..336523d8cc
Binary files /dev/null and b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/Metronome/Metronome.uni b/MdeModulePkg/Universal/Metronome/Metronome.uni
new file mode 100644
index 0000000000..73f5cc33d1
Binary files /dev/null and b/MdeModulePkg/Universal/Metronome/Metronome.uni differ
diff --git a/MdeModulePkg/Universal/Metronome/MetronomeExtra.uni b/MdeModulePkg/Universal/Metronome/MetronomeExtra.uni
new file mode 100644
index 0000000000..30a767db19
Binary files /dev/null and b/MdeModulePkg/Universal/Metronome/MetronomeExtra.uni differ
diff --git a/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.uni b/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.uni
new file mode 100644
index 0000000000..8f04855ffc
Binary files /dev/null and b/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.uni differ
diff --git a/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxeExtra.uni b/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxeExtra.uni
new file mode 100644
index 0000000000..851afdd2c8
Binary files /dev/null and b/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.uni b/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.uni
new file mode 100644
index 0000000000..29e324c4c9
Binary files /dev/null and b/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.uni differ
diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxeExtra.uni b/MdeModulePkg/Universal/Network/ArpDxe/ArpDxeExtra.uni
new file mode 100644
index 0000000000..de8045a6d8
Binary files /dev/null and b/MdeModulePkg/Universal/Network/ArpDxe/ArpDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.uni b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.uni
new file mode 100644
index 0000000000..05c04b6f85
Binary files /dev/null and b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.uni differ
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4DxeExtra.uni b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4DxeExtra.uni
new file mode 100644
index 0000000000..f06b0d4803
Binary files /dev/null and b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4DxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.uni b/MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.uni
new file mode 100644
index 0000000000..75feb8d16f
Binary files /dev/null and b/MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.uni differ
diff --git a/MdeModulePkg/Universal/Network/DpcDxe/DpcDxeExtra.uni b/MdeModulePkg/Universal/Network/DpcDxe/DpcDxeExtra.uni
new file mode 100644
index 0000000000..ca47539550
Binary files /dev/null and b/MdeModulePkg/Universal/Network/DpcDxe/DpcDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsi4Dxe.uni b/MdeModulePkg/Universal/Network/IScsiDxe/IScsi4Dxe.uni
new file mode 100644
index 0000000000..1806b21640
Binary files /dev/null and b/MdeModulePkg/Universal/Network/IScsiDxe/IScsi4Dxe.uni differ
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsi4DxeExtra.uni b/MdeModulePkg/Universal/Network/IScsiDxe/IScsi4DxeExtra.uni
new file mode 100644
index 0000000000..0753072161
Binary files /dev/null and b/MdeModulePkg/Universal/Network/IScsiDxe/IScsi4DxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.uni b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.uni
new file mode 100644
index 0000000000..99f34b8313
Binary files /dev/null and b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.uni differ
diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxeExtra.uni b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxeExtra.uni
new file mode 100644
index 0000000000..a0bf5a8387
Binary files /dev/null and b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.uni b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.uni
new file mode 100644
index 0000000000..316a7d322b
Binary files /dev/null and b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.uni differ
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4DxeExtra.uni b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4DxeExtra.uni
new file mode 100644
index 0000000000..7923ef1c7f
Binary files /dev/null and b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4DxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.uni b/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.uni
new file mode 100644
index 0000000000..1204b88fbc
Binary files /dev/null and b/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.uni differ
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxeExtra.uni b/MdeModulePkg/Universal/Network/MnpDxe/MnpDxeExtra.uni
new file mode 100644
index 0000000000..ab0cf08400
Binary files /dev/null and b/MdeModulePkg/Universal/Network/MnpDxe/MnpDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.uni b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.uni
new file mode 100644
index 0000000000..7e935e306a
Binary files /dev/null and b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.uni differ
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4DxeExtra.uni b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4DxeExtra.uni
new file mode 100644
index 0000000000..8d2508c774
Binary files /dev/null and b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4DxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.uni b/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.uni
new file mode 100644
index 0000000000..248712ae27
Binary files /dev/null and b/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.uni differ
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/SnpDxeExtra.uni b/MdeModulePkg/Universal/Network/SnpDxe/SnpDxeExtra.uni
new file mode 100644
index 0000000000..aec08b1811
Binary files /dev/null and b/MdeModulePkg/Universal/Network/SnpDxe/SnpDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.uni b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.uni
new file mode 100644
index 0000000000..1dab233717
Binary files /dev/null and b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.uni differ
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4DxeExtra.uni b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4DxeExtra.uni
new file mode 100644
index 0000000000..7690fe5a13
Binary files /dev/null and b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4DxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.uni b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.uni
new file mode 100644
index 0000000000..acfb467262
Binary files /dev/null and b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.uni differ
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4DxeExtra.uni b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4DxeExtra.uni
new file mode 100644
index 0000000000..09a7a35b02
Binary files /dev/null and b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4DxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxe4BcDxe.uni b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxe4BcDxe.uni
new file mode 100644
index 0000000000..f8eb4c4cb4
Binary files /dev/null and b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxe4BcDxe.uni differ
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxe4BcDxeExtra.uni b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxe4BcDxeExtra.uni
new file mode 100644
index 0000000000..f132359193
Binary files /dev/null and b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxe4BcDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.uni b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.uni
new file mode 100644
index 0000000000..c27d283544
Binary files /dev/null and b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.uni differ
diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxeExtra.uni b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxeExtra.uni
new file mode 100644
index 0000000000..ade7f17af8
Binary files /dev/null and b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/PCD/Dxe/PcdDxe.uni b/MdeModulePkg/Universal/PCD/Dxe/PcdDxe.uni
new file mode 100644
index 0000000000..f04cfa0700
Binary files /dev/null and b/MdeModulePkg/Universal/PCD/Dxe/PcdDxe.uni differ
diff --git a/MdeModulePkg/Universal/PCD/Dxe/PcdDxeExtra.uni b/MdeModulePkg/Universal/PCD/Dxe/PcdDxeExtra.uni
new file mode 100644
index 0000000000..3b4b5018f7
Binary files /dev/null and b/MdeModulePkg/Universal/PCD/Dxe/PcdDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/PCD/Pei/PcdPeim.uni b/MdeModulePkg/Universal/PCD/Pei/PcdPeim.uni
new file mode 100644
index 0000000000..a898cd74f8
Binary files /dev/null and b/MdeModulePkg/Universal/PCD/Pei/PcdPeim.uni differ
diff --git a/MdeModulePkg/Universal/PCD/Pei/PcdPeimExtra.uni b/MdeModulePkg/Universal/PCD/Pei/PcdPeimExtra.uni
new file mode 100644
index 0000000000..6eee5eac0f
Binary files /dev/null and b/MdeModulePkg/Universal/PCD/Pei/PcdPeimExtra.uni differ
diff --git a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2Pei.uni b/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2Pei.uni
new file mode 100644
index 0000000000..ca1b8205cb
Binary files /dev/null and b/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2Pei.uni differ
diff --git a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2PeiExtra.uni b/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2PeiExtra.uni
new file mode 100644
index 0000000000..394a7fa448
Binary files /dev/null and b/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2PeiExtra.uni differ
diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.uni b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.uni
new file mode 100644
index 0000000000..d81d746813
Binary files /dev/null and b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.uni differ
diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxeExtra.uni b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxeExtra.uni
new file mode 100644
index 0000000000..66e893314e
Binary files /dev/null and b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/VfrStrings.uni b/MdeModulePkg/Universal/PlatformDriOverrideDxe/VfrStrings.uni
index 349c1f13eb..7800cfd3a2 100644
Binary files a/MdeModulePkg/Universal/PlatformDriOverrideDxe/VfrStrings.uni and b/MdeModulePkg/Universal/PlatformDriOverrideDxe/VfrStrings.uni differ
diff --git a/MdeModulePkg/Universal/PrintDxe/PrintDxe.uni b/MdeModulePkg/Universal/PrintDxe/PrintDxe.uni
new file mode 100644
index 0000000000..add044761f
Binary files /dev/null and b/MdeModulePkg/Universal/PrintDxe/PrintDxe.uni differ
diff --git a/MdeModulePkg/Universal/PrintDxe/PrintDxeExtra.uni b/MdeModulePkg/Universal/PrintDxe/PrintDxeExtra.uni
new file mode 100644
index 0000000000..0f1f2bd579
Binary files /dev/null and b/MdeModulePkg/Universal/PrintDxe/PrintDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.uni b/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.uni
new file mode 100644
index 0000000000..f5eabf71cd
Binary files /dev/null and b/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.uni differ
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPeiExtra.uni b/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPeiExtra.uni
new file mode 100644
index 0000000000..965c094b62
Binary files /dev/null and b/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPeiExtra.uni differ
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.uni b/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.uni
new file mode 100644
index 0000000000..859d8f9ca7
Binary files /dev/null and b/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.uni differ
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxeExtra.uni b/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxeExtra.uni
new file mode 100644
index 0000000000..89be808583
Binary files /dev/null and b/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.uni b/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.uni
new file mode 100644
index 0000000000..48afc8fbd9
Binary files /dev/null and b/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.uni differ
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmmExtra.uni b/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmmExtra.uni
new file mode 100644
index 0000000000..92264ec5d0
Binary files /dev/null and b/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmmExtra.uni differ
diff --git a/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.uni b/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.uni
new file mode 100644
index 0000000000..7189f69b01
Binary files /dev/null and b/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.uni differ
diff --git a/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxeExtra.uni b/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxeExtra.uni
new file mode 100644
index 0000000000..b20565f568
Binary files /dev/null and b/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.uni b/MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.uni
new file mode 100644
index 0000000000..f77a6abeb2
Binary files /dev/null and b/MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.uni differ
diff --git a/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPei.uni b/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPei.uni
new file mode 100644
index 0000000000..c1722771f7
Binary files /dev/null and b/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPei.uni differ
diff --git a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.uni b/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.uni
new file mode 100644
index 0000000000..64671f9a30
Binary files /dev/null and b/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.uni differ
diff --git a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxeExtra.uni b/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxeExtra.uni
new file mode 100644
index 0000000000..cd3616e435
Binary files /dev/null and b/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowser.uni b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowser.uni
new file mode 100644
index 0000000000..69f328283a
Binary files /dev/null and b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowser.uni differ
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserExtra.uni b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserExtra.uni
new file mode 100644
index 0000000000..53c88fe06b
Binary files /dev/null and b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserExtra.uni differ
diff --git a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.uni b/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.uni
new file mode 100644
index 0000000000..17182ef19c
Binary files /dev/null and b/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.uni differ
diff --git a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxeExtra.uni b/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxeExtra.uni
new file mode 100644
index 0000000000..b3631121e8
Binary files /dev/null and b/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.uni b/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.uni
new file mode 100644
index 0000000000..bb448a3797
Binary files /dev/null and b/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.uni differ
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPeiExtra.uni b/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPeiExtra.uni
new file mode 100644
index 0000000000..60cc966cc3
Binary files /dev/null and b/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPeiExtra.uni differ
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.uni b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.uni
new file mode 100644
index 0000000000..f72a1c5623
Binary files /dev/null and b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.uni differ
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxeExtra.uni b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxeExtra.uni
new file mode 100644
index 0000000000..67638c621b
Binary files /dev/null and b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.uni b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.uni
new file mode 100644
index 0000000000..35c7a4347a
Binary files /dev/null and b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.uni differ
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmmExtra.uni b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmmExtra.uni
new file mode 100644
index 0000000000..40f0c6c022
Binary files /dev/null and b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmmExtra.uni differ
diff --git a/MdeModulePkg/Universal/TimestampDxe/TimestampDxe.uni b/MdeModulePkg/Universal/TimestampDxe/TimestampDxe.uni
new file mode 100644
index 0000000000..6681d7f7a4
Binary files /dev/null and b/MdeModulePkg/Universal/TimestampDxe/TimestampDxe.uni differ
diff --git a/MdeModulePkg/Universal/TimestampDxe/TimestampDxeExtra.uni b/MdeModulePkg/Universal/TimestampDxe/TimestampDxeExtra.uni
new file mode 100644
index 0000000000..08e2f02733
Binary files /dev/null and b/MdeModulePkg/Universal/TimestampDxe/TimestampDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.uni b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.uni
new file mode 100644
index 0000000000..aa265c1acc
Binary files /dev/null and b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.uni differ
diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxeExtra.uni b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxeExtra.uni
new file mode 100644
index 0000000000..766bb0a14b
Binary files /dev/null and b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/Variable/Pei/PeiVariable.uni b/MdeModulePkg/Universal/Variable/Pei/PeiVariable.uni
new file mode 100644
index 0000000000..7b129a9e0b
Binary files /dev/null and b/MdeModulePkg/Universal/Variable/Pei/PeiVariable.uni differ
diff --git a/MdeModulePkg/Universal/Variable/Pei/PeiVariableExtra.uni b/MdeModulePkg/Universal/Variable/Pei/PeiVariableExtra.uni
new file mode 100644
index 0000000000..24b14d6d9c
Binary files /dev/null and b/MdeModulePkg/Universal/Variable/Pei/PeiVariableExtra.uni differ
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.uni b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.uni
new file mode 100644
index 0000000000..63109a163a
Binary files /dev/null and b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.uni differ
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxeExtra.uni b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxeExtra.uni
new file mode 100644
index 0000000000..e7361c8512
Binary files /dev/null and b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.uni b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.uni
new file mode 100644
index 0000000000..2ea9ce3bfe
Binary files /dev/null and b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.uni differ
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmExtra.uni b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmExtra.uni
new file mode 100644
index 0000000000..e42cc12b4d
Binary files /dev/null and b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmExtra.uni differ
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.uni b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.uni
new file mode 100644
index 0000000000..0765f97f0c
Binary files /dev/null and b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.uni differ
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxeExtra.uni b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxeExtra.uni
new file mode 100644
index 0000000000..e79ea93c81
Binary files /dev/null and b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxeExtra.uni differ
diff --git a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.uni b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.uni
new file mode 100644
index 0000000000..3a7b36b38d
Binary files /dev/null and b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.uni differ
diff --git a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimerExtra.uni b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimerExtra.uni
new file mode 100644
index 0000000000..e3595cbce6
Binary files /dev/null and b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimerExtra.uni differ