SecurityPkg: Move to new location

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Guo Mang <mang.guo@intel.com>

389 files changed, 0 insertions, 0 deletions

diff --git a/SecurityPkg/Application/RngTest/RngTest.c b/Core/SecurityPkg/Application/RngTest/RngTest.c
index f501f806e9..f501f806e9 100644
--- a/SecurityPkg/Application/RngTest/RngTest.c
+++ b/Core/SecurityPkg/Application/RngTest/RngTest.c
diff --git a/SecurityPkg/Application/RngTest/RngTest.inf b/Core/SecurityPkg/Application/RngTest/RngTest.inf
index 334cff45b0..334cff45b0 100644
--- a/SecurityPkg/Application/RngTest/RngTest.inf
+++ b/Core/SecurityPkg/Application/RngTest/RngTest.inf
diff --git a/SecurityPkg/Application/RngTest/RngTest.uni b/Core/SecurityPkg/Application/RngTest/RngTest.uni
index 2cf82f9a37..2cf82f9a37 100644
--- a/SecurityPkg/Application/RngTest/RngTest.uni
+++ b/Core/SecurityPkg/Application/RngTest/RngTest.uni
diff --git a/SecurityPkg/Application/RngTest/RngTestExtra.uni b/Core/SecurityPkg/Application/RngTest/RngTestExtra.uni
index 9f2a92d1c9..9f2a92d1c9 100644
--- a/SecurityPkg/Application/RngTest/RngTestExtra.uni
+++ b/Core/SecurityPkg/Application/RngTest/RngTestExtra.uni
diff --git a/SecurityPkg/Contributions.txt b/Core/SecurityPkg/Contributions.txt
index f87cbd73c6..f87cbd73c6 100644
--- a/SecurityPkg/Contributions.txt
+++ b/Core/SecurityPkg/Contributions.txt
diff --git a/SecurityPkg/Hash2DxeCrypto/Driver.c b/Core/SecurityPkg/Hash2DxeCrypto/Driver.c
index d63ca2c209..d63ca2c209 100644
--- a/SecurityPkg/Hash2DxeCrypto/Driver.c
+++ b/Core/SecurityPkg/Hash2DxeCrypto/Driver.c
diff --git a/SecurityPkg/Hash2DxeCrypto/Driver.h b/Core/SecurityPkg/Hash2DxeCrypto/Driver.h
index 9a1cd587da..9a1cd587da 100644
--- a/SecurityPkg/Hash2DxeCrypto/Driver.h
+++ b/Core/SecurityPkg/Hash2DxeCrypto/Driver.h
diff --git a/SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.c b/Core/SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.c
index 93e3273916..93e3273916 100644
--- a/SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.c
+++ b/Core/SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.c
diff --git a/SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.inf b/Core/SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.inf
index 557dedbbea..557dedbbea 100644
--- a/SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.inf
+++ b/Core/SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.inf
diff --git a/SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.uni b/Core/SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.uni
index 1253087443..1253087443 100644
--- a/SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.uni
+++ b/Core/SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.uni
diff --git a/SecurityPkg/Hash2DxeCrypto/Hash2DxeCryptoExtra.uni b/Core/SecurityPkg/Hash2DxeCrypto/Hash2DxeCryptoExtra.uni
index f70b8baa6b..f70b8baa6b 100644
--- a/SecurityPkg/Hash2DxeCrypto/Hash2DxeCryptoExtra.uni
+++ b/Core/SecurityPkg/Hash2DxeCrypto/Hash2DxeCryptoExtra.uni
diff --git a/SecurityPkg/Include/Guid/AuthenticatedVariableFormat.h b/Core/SecurityPkg/Include/Guid/AuthenticatedVariableFormat.h
index 55fd92a322..55fd92a322 100644
--- a/SecurityPkg/Include/Guid/AuthenticatedVariableFormat.h
+++ b/Core/SecurityPkg/Include/Guid/AuthenticatedVariableFormat.h
diff --git a/SecurityPkg/Include/Guid/MeasuredFvHob.h b/Core/SecurityPkg/Include/Guid/MeasuredFvHob.h
index a2e6922335..a2e6922335 100644
--- a/SecurityPkg/Include/Guid/MeasuredFvHob.h
+++ b/Core/SecurityPkg/Include/Guid/MeasuredFvHob.h
diff --git a/SecurityPkg/Include/Guid/OpalPasswordExtraInfoVariable.h b/Core/SecurityPkg/Include/Guid/OpalPasswordExtraInfoVariable.h
index f16d0a4ac3..f16d0a4ac3 100644
--- a/SecurityPkg/Include/Guid/OpalPasswordExtraInfoVariable.h
+++ b/Core/SecurityPkg/Include/Guid/OpalPasswordExtraInfoVariable.h
diff --git a/SecurityPkg/Include/Guid/PhysicalPresenceData.h b/Core/SecurityPkg/Include/Guid/PhysicalPresenceData.h
index 165b4647c0..165b4647c0 100644
--- a/SecurityPkg/Include/Guid/PhysicalPresenceData.h
+++ b/Core/SecurityPkg/Include/Guid/PhysicalPresenceData.h
diff --git a/SecurityPkg/Include/Guid/PwdCredentialProviderHii.h b/Core/SecurityPkg/Include/Guid/PwdCredentialProviderHii.h
index 007144abfd..007144abfd 100644
--- a/SecurityPkg/Include/Guid/PwdCredentialProviderHii.h
+++ b/Core/SecurityPkg/Include/Guid/PwdCredentialProviderHii.h
diff --git a/SecurityPkg/Include/Guid/SecureBootConfigHii.h b/Core/SecurityPkg/Include/Guid/SecureBootConfigHii.h
index 5f162486f4..5f162486f4 100644
--- a/SecurityPkg/Include/Guid/SecureBootConfigHii.h
+++ b/Core/SecurityPkg/Include/Guid/SecureBootConfigHii.h
diff --git a/SecurityPkg/Include/Guid/SecurityPkgTokenSpace.h b/Core/SecurityPkg/Include/Guid/SecurityPkgTokenSpace.h
index b1b7666f18..b1b7666f18 100644
--- a/SecurityPkg/Include/Guid/SecurityPkgTokenSpace.h
+++ b/Core/SecurityPkg/Include/Guid/SecurityPkgTokenSpace.h
diff --git a/SecurityPkg/Include/Guid/Tcg2ConfigHii.h b/Core/SecurityPkg/Include/Guid/Tcg2ConfigHii.h
index 28e31e3475..28e31e3475 100644
--- a/SecurityPkg/Include/Guid/Tcg2ConfigHii.h
+++ b/Core/SecurityPkg/Include/Guid/Tcg2ConfigHii.h
diff --git a/SecurityPkg/Include/Guid/Tcg2PhysicalPresenceData.h b/Core/SecurityPkg/Include/Guid/Tcg2PhysicalPresenceData.h
index df43fd9c80..df43fd9c80 100644
--- a/SecurityPkg/Include/Guid/Tcg2PhysicalPresenceData.h
+++ b/Core/SecurityPkg/Include/Guid/Tcg2PhysicalPresenceData.h
diff --git a/SecurityPkg/Include/Guid/TcgConfigHii.h b/Core/SecurityPkg/Include/Guid/TcgConfigHii.h
index d316299f8f..d316299f8f 100644
--- a/SecurityPkg/Include/Guid/TcgConfigHii.h
+++ b/Core/SecurityPkg/Include/Guid/TcgConfigHii.h
diff --git a/SecurityPkg/Include/Guid/TcgEventHob.h b/Core/SecurityPkg/Include/Guid/TcgEventHob.h
index 943a7c601c..943a7c601c 100644
--- a/SecurityPkg/Include/Guid/TcgEventHob.h
+++ b/Core/SecurityPkg/Include/Guid/TcgEventHob.h
diff --git a/SecurityPkg/Include/Guid/TpmInstance.h b/Core/SecurityPkg/Include/Guid/TpmInstance.h
index 27c727bafd..27c727bafd 100644
--- a/SecurityPkg/Include/Guid/TpmInstance.h
+++ b/Core/SecurityPkg/Include/Guid/TpmInstance.h
diff --git a/SecurityPkg/Include/Guid/TrEEConfigHii.h b/Core/SecurityPkg/Include/Guid/TrEEConfigHii.h
index b5d1de746a..b5d1de746a 100644
--- a/SecurityPkg/Include/Guid/TrEEConfigHii.h
+++ b/Core/SecurityPkg/Include/Guid/TrEEConfigHii.h
diff --git a/SecurityPkg/Include/Guid/TrEEPhysicalPresenceData.h b/Core/SecurityPkg/Include/Guid/TrEEPhysicalPresenceData.h
index 0e2f8d1096..0e2f8d1096 100644
--- a/SecurityPkg/Include/Guid/TrEEPhysicalPresenceData.h
+++ b/Core/SecurityPkg/Include/Guid/TrEEPhysicalPresenceData.h
diff --git a/SecurityPkg/Include/Guid/UsbCredentialProviderHii.h b/Core/SecurityPkg/Include/Guid/UsbCredentialProviderHii.h
index 217aef6567..217aef6567 100644
--- a/SecurityPkg/Include/Guid/UsbCredentialProviderHii.h
+++ b/Core/SecurityPkg/Include/Guid/UsbCredentialProviderHii.h
diff --git a/SecurityPkg/Include/Guid/UserIdentifyManagerHii.h b/Core/SecurityPkg/Include/Guid/UserIdentifyManagerHii.h
index 11d215c5dd..11d215c5dd 100644
--- a/SecurityPkg/Include/Guid/UserIdentifyManagerHii.h
+++ b/Core/SecurityPkg/Include/Guid/UserIdentifyManagerHii.h
diff --git a/SecurityPkg/Include/Guid/UserProfileManagerHii.h b/Core/SecurityPkg/Include/Guid/UserProfileManagerHii.h
index e53e5a13e6..e53e5a13e6 100644
--- a/SecurityPkg/Include/Guid/UserProfileManagerHii.h
+++ b/Core/SecurityPkg/Include/Guid/UserProfileManagerHii.h
diff --git a/SecurityPkg/Include/Library/HashLib.h b/Core/SecurityPkg/Include/Library/HashLib.h
index 8be8b9c59c..8be8b9c59c 100644
--- a/SecurityPkg/Include/Library/HashLib.h
+++ b/Core/SecurityPkg/Include/Library/HashLib.h
diff --git a/SecurityPkg/Include/Library/OpalPasswordSupportLib.h b/Core/SecurityPkg/Include/Library/OpalPasswordSupportLib.h
index e616c763f0..e616c763f0 100644
--- a/SecurityPkg/Include/Library/OpalPasswordSupportLib.h
+++ b/Core/SecurityPkg/Include/Library/OpalPasswordSupportLib.h
diff --git a/SecurityPkg/Include/Library/PlatformSecureLib.h b/Core/SecurityPkg/Include/Library/PlatformSecureLib.h
index 6a4cb147a6..6a4cb147a6 100644
--- a/SecurityPkg/Include/Library/PlatformSecureLib.h
+++ b/Core/SecurityPkg/Include/Library/PlatformSecureLib.h
diff --git a/SecurityPkg/Include/Library/Tcg2PhysicalPresenceLib.h b/Core/SecurityPkg/Include/Library/Tcg2PhysicalPresenceLib.h
index 3e446acab2..3e446acab2 100644
--- a/SecurityPkg/Include/Library/Tcg2PhysicalPresenceLib.h
+++ b/Core/SecurityPkg/Include/Library/Tcg2PhysicalPresenceLib.h
diff --git a/SecurityPkg/Include/Library/Tcg2PpVendorLib.h b/Core/SecurityPkg/Include/Library/Tcg2PpVendorLib.h
index 5ae7413273..5ae7413273 100644
--- a/SecurityPkg/Include/Library/Tcg2PpVendorLib.h
+++ b/Core/SecurityPkg/Include/Library/Tcg2PpVendorLib.h
diff --git a/SecurityPkg/Include/Library/TcgPhysicalPresenceLib.h b/Core/SecurityPkg/Include/Library/TcgPhysicalPresenceLib.h
index b451823bdf..b451823bdf 100644
--- a/SecurityPkg/Include/Library/TcgPhysicalPresenceLib.h
+++ b/Core/SecurityPkg/Include/Library/TcgPhysicalPresenceLib.h
diff --git a/SecurityPkg/Include/Library/TcgPpVendorLib.h b/Core/SecurityPkg/Include/Library/TcgPpVendorLib.h
index 284aa9ed72..284aa9ed72 100644
--- a/SecurityPkg/Include/Library/TcgPpVendorLib.h
+++ b/Core/SecurityPkg/Include/Library/TcgPpVendorLib.h
diff --git a/SecurityPkg/Include/Library/TcgStorageCoreLib.h b/Core/SecurityPkg/Include/Library/TcgStorageCoreLib.h
index 67ccf22892..67ccf22892 100644
--- a/SecurityPkg/Include/Library/TcgStorageCoreLib.h
+++ b/Core/SecurityPkg/Include/Library/TcgStorageCoreLib.h
diff --git a/SecurityPkg/Include/Library/TcgStorageOpalLib.h b/Core/SecurityPkg/Include/Library/TcgStorageOpalLib.h
index 9b64a8e5cd..9b64a8e5cd 100644
--- a/SecurityPkg/Include/Library/TcgStorageOpalLib.h
+++ b/Core/SecurityPkg/Include/Library/TcgStorageOpalLib.h
diff --git a/SecurityPkg/Include/Library/Tpm12CommandLib.h b/Core/SecurityPkg/Include/Library/Tpm12CommandLib.h
index f7c098f283..f7c098f283 100644
--- a/SecurityPkg/Include/Library/Tpm12CommandLib.h
+++ b/Core/SecurityPkg/Include/Library/Tpm12CommandLib.h
diff --git a/SecurityPkg/Include/Library/Tpm12DeviceLib.h b/Core/SecurityPkg/Include/Library/Tpm12DeviceLib.h
index ab1f522ad0..ab1f522ad0 100644
--- a/SecurityPkg/Include/Library/Tpm12DeviceLib.h
+++ b/Core/SecurityPkg/Include/Library/Tpm12DeviceLib.h
diff --git a/SecurityPkg/Include/Library/Tpm2CommandLib.h b/Core/SecurityPkg/Include/Library/Tpm2CommandLib.h
index 80ada7397b..80ada7397b 100644
--- a/SecurityPkg/Include/Library/Tpm2CommandLib.h
+++ b/Core/SecurityPkg/Include/Library/Tpm2CommandLib.h
diff --git a/SecurityPkg/Include/Library/Tpm2DeviceLib.h b/Core/SecurityPkg/Include/Library/Tpm2DeviceLib.h
index 67f158ef03..67f158ef03 100644
--- a/SecurityPkg/Include/Library/Tpm2DeviceLib.h
+++ b/Core/SecurityPkg/Include/Library/Tpm2DeviceLib.h
diff --git a/SecurityPkg/Include/Library/TpmCommLib.h b/Core/SecurityPkg/Include/Library/TpmCommLib.h
index 6c97569c67..6c97569c67 100644
--- a/SecurityPkg/Include/Library/TpmCommLib.h
+++ b/Core/SecurityPkg/Include/Library/TpmCommLib.h
diff --git a/SecurityPkg/Include/Library/TrEEPhysicalPresenceLib.h b/Core/SecurityPkg/Include/Library/TrEEPhysicalPresenceLib.h
index ba809b9cf9..ba809b9cf9 100644
--- a/SecurityPkg/Include/Library/TrEEPhysicalPresenceLib.h
+++ b/Core/SecurityPkg/Include/Library/TrEEPhysicalPresenceLib.h
diff --git a/SecurityPkg/Include/Library/TrEEPpVendorLib.h b/Core/SecurityPkg/Include/Library/TrEEPpVendorLib.h
index f0dcfd9967..f0dcfd9967 100644
--- a/SecurityPkg/Include/Library/TrEEPpVendorLib.h
+++ b/Core/SecurityPkg/Include/Library/TrEEPpVendorLib.h
diff --git a/SecurityPkg/Include/Ppi/FirmwareVolumeInfoMeasurementExcluded.h b/Core/SecurityPkg/Include/Ppi/FirmwareVolumeInfoMeasurementExcluded.h
index d99fc1db38..d99fc1db38 100644
--- a/SecurityPkg/Include/Ppi/FirmwareVolumeInfoMeasurementExcluded.h
+++ b/Core/SecurityPkg/Include/Ppi/FirmwareVolumeInfoMeasurementExcluded.h
diff --git a/SecurityPkg/Include/Ppi/LockPhysicalPresence.h b/Core/SecurityPkg/Include/Ppi/LockPhysicalPresence.h
index 0ae3b7b0ab..0ae3b7b0ab 100644
--- a/SecurityPkg/Include/Ppi/LockPhysicalPresence.h
+++ b/Core/SecurityPkg/Include/Ppi/LockPhysicalPresence.h
diff --git a/SecurityPkg/Include/Ppi/TpmInitialized.h b/Core/SecurityPkg/Include/Ppi/TpmInitialized.h
index 7d458f5e12..7d458f5e12 100644
--- a/SecurityPkg/Include/Ppi/TpmInitialized.h
+++ b/Core/SecurityPkg/Include/Ppi/TpmInitialized.h
diff --git a/SecurityPkg/Library/AuthVariableLib/AuthService.c b/Core/SecurityPkg/Library/AuthVariableLib/AuthService.c
index a37ec0bd0f..a37ec0bd0f 100644
--- a/SecurityPkg/Library/AuthVariableLib/AuthService.c
+++ b/Core/SecurityPkg/Library/AuthVariableLib/AuthService.c
diff --git a/SecurityPkg/Library/AuthVariableLib/AuthServiceInternal.h b/Core/SecurityPkg/Library/AuthVariableLib/AuthServiceInternal.h
index e9b7cf3579..e9b7cf3579 100644
--- a/SecurityPkg/Library/AuthVariableLib/AuthServiceInternal.h
+++ b/Core/SecurityPkg/Library/AuthVariableLib/AuthServiceInternal.h
diff --git a/SecurityPkg/Library/AuthVariableLib/AuthVariableLib.c b/Core/SecurityPkg/Library/AuthVariableLib/AuthVariableLib.c
index 792a1232ae..792a1232ae 100644
--- a/SecurityPkg/Library/AuthVariableLib/AuthVariableLib.c
+++ b/Core/SecurityPkg/Library/AuthVariableLib/AuthVariableLib.c
diff --git a/SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf b/Core/SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf
index 572ba4e120..572ba4e120 100644
--- a/SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf
+++ b/Core/SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf
diff --git a/SecurityPkg/Library/AuthVariableLib/AuthVariableLib.uni b/Core/SecurityPkg/Library/AuthVariableLib/AuthVariableLib.uni
index 59e5b64c4b..59e5b64c4b 100644
--- a/SecurityPkg/Library/AuthVariableLib/AuthVariableLib.uni
+++ b/Core/SecurityPkg/Library/AuthVariableLib/AuthVariableLib.uni
diff --git a/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.c b/Core/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.c
index 02a87f9077..02a87f9077 100644
--- a/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.c
+++ b/Core/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.c
diff --git a/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.h b/Core/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.h
index fd750be512..fd750be512 100644
--- a/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.h
+++ b/Core/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.h
diff --git a/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.inf b/Core/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.inf
index 8297230bed..8297230bed 100644
--- a/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.inf
+++ b/Core/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.inf
diff --git a/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.uni b/Core/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.uni
index fd49a032ea..fd49a032ea 100644
--- a/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.uni
+++ b/Core/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.uni
diff --git a/SecurityPkg/Library/DxeImageAuthenticationStatusLib/DxeImageAuthenticationStatusLib.c b/Core/SecurityPkg/Library/DxeImageAuthenticationStatusLib/DxeImageAuthenticationStatusLib.c
index bc1acd1fed..bc1acd1fed 100644
--- a/SecurityPkg/Library/DxeImageAuthenticationStatusLib/DxeImageAuthenticationStatusLib.c
+++ b/Core/SecurityPkg/Library/DxeImageAuthenticationStatusLib/DxeImageAuthenticationStatusLib.c
diff --git a/SecurityPkg/Library/DxeImageAuthenticationStatusLib/DxeImageAuthenticationStatusLib.inf b/Core/SecurityPkg/Library/DxeImageAuthenticationStatusLib/DxeImageAuthenticationStatusLib.inf
index 62fcdaacc6..62fcdaacc6 100644
--- a/SecurityPkg/Library/DxeImageAuthenticationStatusLib/DxeImageAuthenticationStatusLib.inf
+++ b/Core/SecurityPkg/Library/DxeImageAuthenticationStatusLib/DxeImageAuthenticationStatusLib.inf
diff --git a/SecurityPkg/Library/DxeImageAuthenticationStatusLib/DxeImageAuthenticationStatusLib.uni b/Core/SecurityPkg/Library/DxeImageAuthenticationStatusLib/DxeImageAuthenticationStatusLib.uni
index 4c5c74ce40..4c5c74ce40 100644
--- a/SecurityPkg/Library/DxeImageAuthenticationStatusLib/DxeImageAuthenticationStatusLib.uni
+++ b/Core/SecurityPkg/Library/DxeImageAuthenticationStatusLib/DxeImageAuthenticationStatusLib.uni
diff --git a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c b/Core/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
index 588072c6a1..588072c6a1 100644
--- a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
+++ b/Core/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
diff --git a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.h b/Core/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.h
index cff6076368..cff6076368 100644
--- a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.h
+++ b/Core/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.h
diff --git a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf b/Core/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf
index 3430b6ea9d..3430b6ea9d 100644
--- a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf
+++ b/Core/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf
diff --git a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.uni b/Core/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.uni
index 6575e1c4b9..6575e1c4b9 100644
--- a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.uni
+++ b/Core/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.uni
diff --git a/SecurityPkg/Library/DxeImageVerificationLib/Measurement.c b/Core/SecurityPkg/Library/DxeImageVerificationLib/Measurement.c
index 6b98747d4a..6b98747d4a 100644
--- a/SecurityPkg/Library/DxeImageVerificationLib/Measurement.c
+++ b/Core/SecurityPkg/Library/DxeImageVerificationLib/Measurement.c
diff --git a/SecurityPkg/Library/DxeRsa2048Sha256GuidedSectionExtractLib/DxeRsa2048Sha256GuidedSectionExtractLib.c b/Core/SecurityPkg/Library/DxeRsa2048Sha256GuidedSectionExtractLib/DxeRsa2048Sha256GuidedSectionExtractLib.c
index 39768fbac2..39768fbac2 100644
--- a/SecurityPkg/Library/DxeRsa2048Sha256GuidedSectionExtractLib/DxeRsa2048Sha256GuidedSectionExtractLib.c
+++ b/Core/SecurityPkg/Library/DxeRsa2048Sha256GuidedSectionExtractLib/DxeRsa2048Sha256GuidedSectionExtractLib.c
diff --git a/SecurityPkg/Library/DxeRsa2048Sha256GuidedSectionExtractLib/DxeRsa2048Sha256GuidedSectionExtractLib.inf b/Core/SecurityPkg/Library/DxeRsa2048Sha256GuidedSectionExtractLib/DxeRsa2048Sha256GuidedSectionExtractLib.inf
index 4681f08643..4681f08643 100644
--- a/SecurityPkg/Library/DxeRsa2048Sha256GuidedSectionExtractLib/DxeRsa2048Sha256GuidedSectionExtractLib.inf
+++ b/Core/SecurityPkg/Library/DxeRsa2048Sha256GuidedSectionExtractLib/DxeRsa2048Sha256GuidedSectionExtractLib.inf
diff --git a/SecurityPkg/Library/DxeRsa2048Sha256GuidedSectionExtractLib/DxeRsa2048Sha256GuidedSectionExtractLib.uni b/Core/SecurityPkg/Library/DxeRsa2048Sha256GuidedSectionExtractLib/DxeRsa2048Sha256GuidedSectionExtractLib.uni
index 5a043efbb2..5a043efbb2 100644
--- a/SecurityPkg/Library/DxeRsa2048Sha256GuidedSectionExtractLib/DxeRsa2048Sha256GuidedSectionExtractLib.uni
+++ b/Core/SecurityPkg/Library/DxeRsa2048Sha256GuidedSectionExtractLib/DxeRsa2048Sha256GuidedSectionExtractLib.uni
diff --git a/SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.c b/Core/SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.c
index 5bf95a18fc..5bf95a18fc 100644
--- a/SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.c
+++ b/Core/SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.c
diff --git a/SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf b/Core/SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf
index fc10129989..fc10129989 100644
--- a/SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf
+++ b/Core/SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf
diff --git a/SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.uni b/Core/SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.uni
index 7cb7072c17..7cb7072c17 100644
--- a/SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.uni
+++ b/Core/SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.uni
diff --git a/SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/PhysicalPresenceStrings.uni b/Core/SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/PhysicalPresenceStrings.uni
index 0271b890e0..0271b890e0 100644
--- a/SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/PhysicalPresenceStrings.uni
+++ b/Core/SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/PhysicalPresenceStrings.uni
diff --git a/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.c b/Core/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.c
index 4f35be80bb..4f35be80bb 100644
--- a/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.c
+++ b/Core/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.c
diff --git a/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf b/Core/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf
index 3aacba5c2b..3aacba5c2b 100644
--- a/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf
+++ b/Core/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf
diff --git a/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.uni b/Core/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.uni
index 26f8dd3e99..26f8dd3e99 100644
--- a/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.uni
+++ b/Core/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.uni
diff --git a/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/PhysicalPresenceStrings.uni b/Core/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/PhysicalPresenceStrings.uni
index 065cd63be1..065cd63be1 100644
--- a/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/PhysicalPresenceStrings.uni
+++ b/Core/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/PhysicalPresenceStrings.uni
diff --git a/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.c b/Core/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.c
index aacafa83b3..aacafa83b3 100644
--- a/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.c
+++ b/Core/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.c
diff --git a/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.inf b/Core/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.inf
index a11988e4aa..a11988e4aa 100644
--- a/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.inf
+++ b/Core/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.inf
diff --git a/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.uni b/Core/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.uni
index 260dd04481..260dd04481 100644
--- a/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.uni
+++ b/Core/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.uni
diff --git a/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c b/Core/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c
index 8167a21929..8167a21929 100644
--- a/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c
+++ b/Core/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c
diff --git a/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.inf b/Core/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.inf
index 553e68321e..553e68321e 100644
--- a/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.inf
+++ b/Core/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.inf
diff --git a/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.uni b/Core/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.uni
index 74d6e76d52..74d6e76d52 100644
--- a/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.uni
+++ b/Core/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.uni
diff --git a/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.c b/Core/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.c
index 7a2ec7f221..7a2ec7f221 100644
--- a/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.c
+++ b/Core/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.c
diff --git a/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf b/Core/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
index 410eb788db..410eb788db 100644
--- a/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
+++ b/Core/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
diff --git a/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.uni b/Core/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.uni
index 3003d5c136..3003d5c136 100644
--- a/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.uni
+++ b/Core/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.uni
diff --git a/SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/DxeTrEEPhysicalPresenceLib.c b/Core/SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/DxeTrEEPhysicalPresenceLib.c
index 31b02d907a..31b02d907a 100644
--- a/SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/DxeTrEEPhysicalPresenceLib.c
+++ b/Core/SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/DxeTrEEPhysicalPresenceLib.c
diff --git a/SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/DxeTrEEPhysicalPresenceLib.inf b/Core/SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/DxeTrEEPhysicalPresenceLib.inf
index 1c123efe78..1c123efe78 100644
--- a/SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/DxeTrEEPhysicalPresenceLib.inf
+++ b/Core/SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/DxeTrEEPhysicalPresenceLib.inf
diff --git a/SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/DxeTrEEPhysicalPresenceLib.uni b/Core/SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/DxeTrEEPhysicalPresenceLib.uni
index 7cb7072c17..7cb7072c17 100644
--- a/SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/DxeTrEEPhysicalPresenceLib.uni
+++ b/Core/SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/DxeTrEEPhysicalPresenceLib.uni
diff --git a/SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/PhysicalPresenceStrings.uni b/Core/SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/PhysicalPresenceStrings.uni
index 633789f33f..633789f33f 100644
--- a/SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/PhysicalPresenceStrings.uni
+++ b/Core/SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/PhysicalPresenceStrings.uni
diff --git a/SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.c b/Core/SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.c
index 69c637c764..69c637c764 100644
--- a/SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.c
+++ b/Core/SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.c
diff --git a/SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf b/Core/SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf
index 215b3cbecd..215b3cbecd 100644
--- a/SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf
+++ b/Core/SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf
diff --git a/SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.uni b/Core/SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.uni
index d327e53a59..d327e53a59 100644
--- a/SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.uni
+++ b/Core/SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.uni
diff --git a/SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationLibRsa2048Sha256.c b/Core/SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationLibRsa2048Sha256.c
index b40993fd1b..b40993fd1b 100644
--- a/SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationLibRsa2048Sha256.c
+++ b/Core/SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationLibRsa2048Sha256.c
diff --git a/SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationLibRsa2048Sha256.inf b/Core/SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationLibRsa2048Sha256.inf
index 633f407f31..633f407f31 100644
--- a/SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationLibRsa2048Sha256.inf
+++ b/Core/SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationLibRsa2048Sha256.inf
diff --git a/SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationLibRsa2048Sha256.uni b/Core/SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationLibRsa2048Sha256.uni
index 902edef8fa..902edef8fa 100644
--- a/SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationLibRsa2048Sha256.uni
+++ b/Core/SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationLibRsa2048Sha256.uni
diff --git a/SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.c b/Core/SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.c
index 6dc3508be0..6dc3508be0 100644
--- a/SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.c
+++ b/Core/SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.c
diff --git a/SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf b/Core/SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf
index 588c5f1ac4..588c5f1ac4 100644
--- a/SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf
+++ b/Core/SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf
diff --git a/SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.uni b/Core/SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.uni
index 03c8dcc416..03c8dcc416 100644
--- a/SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.uni
+++ b/Core/SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.uni
diff --git a/SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.c b/Core/SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.c
index 32e03120be..32e03120be 100644
--- a/SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.c
+++ b/Core/SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.c
diff --git a/SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf b/Core/SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
index a4b2ccf9e2..a4b2ccf9e2 100644
--- a/SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
+++ b/Core/SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
diff --git a/SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.uni b/Core/SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.uni
index a0706f7bf1..a0706f7bf1 100644
--- a/SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.uni
+++ b/Core/SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.uni
diff --git a/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterCommon.c b/Core/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterCommon.c
index adca938410..adca938410 100644
--- a/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterCommon.c
+++ b/Core/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterCommon.c
diff --git a/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterCommon.h b/Core/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterCommon.h
index 88e328bfbc..88e328bfbc 100644
--- a/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterCommon.h
+++ b/Core/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterCommon.h
diff --git a/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.c b/Core/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.c
index 7bb5087550..7bb5087550 100644
--- a/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.c
+++ b/Core/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.c
diff --git a/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf b/Core/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf
index 6e660d4f14..6e660d4f14 100644
--- a/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf
+++ b/Core/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf
diff --git a/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.uni b/Core/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.uni
index db7d8a26f2..db7d8a26f2 100644
--- a/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.uni
+++ b/Core/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.uni
diff --git a/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.c b/Core/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.c
index dbee0f2531..dbee0f2531 100644
--- a/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.c
+++ b/Core/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.c
diff --git a/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf b/Core/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf
index eebf90e2ef..eebf90e2ef 100644
--- a/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf
+++ b/Core/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf
diff --git a/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.uni b/Core/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.uni
index db7d8a26f2..db7d8a26f2 100644
--- a/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.uni
+++ b/Core/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.uni
diff --git a/SecurityPkg/Library/HashLibTpm2/HashLibTpm2.c b/Core/SecurityPkg/Library/HashLibTpm2/HashLibTpm2.c
index cd5dde5be3..cd5dde5be3 100644
--- a/SecurityPkg/Library/HashLibTpm2/HashLibTpm2.c
+++ b/Core/SecurityPkg/Library/HashLibTpm2/HashLibTpm2.c
diff --git a/SecurityPkg/Library/HashLibTpm2/HashLibTpm2.inf b/Core/SecurityPkg/Library/HashLibTpm2/HashLibTpm2.inf
index f807cc7f3d..f807cc7f3d 100644
--- a/SecurityPkg/Library/HashLibTpm2/HashLibTpm2.inf
+++ b/Core/SecurityPkg/Library/HashLibTpm2/HashLibTpm2.inf
diff --git a/SecurityPkg/Library/HashLibTpm2/HashLibTpm2.uni b/Core/SecurityPkg/Library/HashLibTpm2/HashLibTpm2.uni
index ac2895a792..ac2895a792 100644
--- a/SecurityPkg/Library/HashLibTpm2/HashLibTpm2.uni
+++ b/Core/SecurityPkg/Library/HashLibTpm2/HashLibTpm2.uni
diff --git a/SecurityPkg/Library/OpalPasswordSupportLib/OpalPasswordSupportLib.c b/Core/SecurityPkg/Library/OpalPasswordSupportLib/OpalPasswordSupportLib.c
index 837582359e..837582359e 100644
--- a/SecurityPkg/Library/OpalPasswordSupportLib/OpalPasswordSupportLib.c
+++ b/Core/SecurityPkg/Library/OpalPasswordSupportLib/OpalPasswordSupportLib.c
diff --git a/SecurityPkg/Library/OpalPasswordSupportLib/OpalPasswordSupportLib.inf b/Core/SecurityPkg/Library/OpalPasswordSupportLib/OpalPasswordSupportLib.inf
index b7831356e5..b7831356e5 100644
--- a/SecurityPkg/Library/OpalPasswordSupportLib/OpalPasswordSupportLib.inf
+++ b/Core/SecurityPkg/Library/OpalPasswordSupportLib/OpalPasswordSupportLib.inf
diff --git a/SecurityPkg/Library/OpalPasswordSupportLib/OpalPasswordSupportNotify.h b/Core/SecurityPkg/Library/OpalPasswordSupportLib/OpalPasswordSupportNotify.h
index f0ad3a1136..f0ad3a1136 100644
--- a/SecurityPkg/Library/OpalPasswordSupportLib/OpalPasswordSupportNotify.h
+++ b/Core/SecurityPkg/Library/OpalPasswordSupportLib/OpalPasswordSupportNotify.h
diff --git a/SecurityPkg/Library/PeiRsa2048Sha256GuidedSectionExtractLib/PeiRsa2048Sha256GuidedSectionExtractLib.c b/Core/SecurityPkg/Library/PeiRsa2048Sha256GuidedSectionExtractLib/PeiRsa2048Sha256GuidedSectionExtractLib.c
index ba1c700ad0..ba1c700ad0 100644
--- a/SecurityPkg/Library/PeiRsa2048Sha256GuidedSectionExtractLib/PeiRsa2048Sha256GuidedSectionExtractLib.c
+++ b/Core/SecurityPkg/Library/PeiRsa2048Sha256GuidedSectionExtractLib/PeiRsa2048Sha256GuidedSectionExtractLib.c
diff --git a/SecurityPkg/Library/PeiRsa2048Sha256GuidedSectionExtractLib/PeiRsa2048Sha256GuidedSectionExtractLib.inf b/Core/SecurityPkg/Library/PeiRsa2048Sha256GuidedSectionExtractLib/PeiRsa2048Sha256GuidedSectionExtractLib.inf
index 3b781c71c7..3b781c71c7 100644
--- a/SecurityPkg/Library/PeiRsa2048Sha256GuidedSectionExtractLib/PeiRsa2048Sha256GuidedSectionExtractLib.inf
+++ b/Core/SecurityPkg/Library/PeiRsa2048Sha256GuidedSectionExtractLib/PeiRsa2048Sha256GuidedSectionExtractLib.inf
diff --git a/SecurityPkg/Library/PeiRsa2048Sha256GuidedSectionExtractLib/PeiRsa2048Sha256GuidedSectionExtractLib.uni b/Core/SecurityPkg/Library/PeiRsa2048Sha256GuidedSectionExtractLib/PeiRsa2048Sha256GuidedSectionExtractLib.uni
index 5a043efbb2..5a043efbb2 100644
--- a/SecurityPkg/Library/PeiRsa2048Sha256GuidedSectionExtractLib/PeiRsa2048Sha256GuidedSectionExtractLib.uni
+++ b/Core/SecurityPkg/Library/PeiRsa2048Sha256GuidedSectionExtractLib/PeiRsa2048Sha256GuidedSectionExtractLib.uni
diff --git a/SecurityPkg/Library/PeiTcg2PhysicalPresenceLib/PeiTcg2PhysicalPresenceLib.c b/Core/SecurityPkg/Library/PeiTcg2PhysicalPresenceLib/PeiTcg2PhysicalPresenceLib.c
index e190718907..e190718907 100644
--- a/SecurityPkg/Library/PeiTcg2PhysicalPresenceLib/PeiTcg2PhysicalPresenceLib.c
+++ b/Core/SecurityPkg/Library/PeiTcg2PhysicalPresenceLib/PeiTcg2PhysicalPresenceLib.c
diff --git a/SecurityPkg/Library/PeiTcg2PhysicalPresenceLib/PeiTcg2PhysicalPresenceLib.inf b/Core/SecurityPkg/Library/PeiTcg2PhysicalPresenceLib/PeiTcg2PhysicalPresenceLib.inf
index 6d0b7a00cb..6d0b7a00cb 100644
--- a/SecurityPkg/Library/PeiTcg2PhysicalPresenceLib/PeiTcg2PhysicalPresenceLib.inf
+++ b/Core/SecurityPkg/Library/PeiTcg2PhysicalPresenceLib/PeiTcg2PhysicalPresenceLib.inf
diff --git a/SecurityPkg/Library/PeiTcg2PhysicalPresenceLib/PeiTcg2PhysicalPresenceLib.uni b/Core/SecurityPkg/Library/PeiTcg2PhysicalPresenceLib/PeiTcg2PhysicalPresenceLib.uni
index b562ca223c..b562ca223c 100644
--- a/SecurityPkg/Library/PeiTcg2PhysicalPresenceLib/PeiTcg2PhysicalPresenceLib.uni
+++ b/Core/SecurityPkg/Library/PeiTcg2PhysicalPresenceLib/PeiTcg2PhysicalPresenceLib.uni
diff --git a/SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.c b/Core/SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.c
index 8dc07ec74a..8dc07ec74a 100644
--- a/SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.c
+++ b/Core/SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.c
diff --git a/SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.inf b/Core/SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.inf
index be415f4166..be415f4166 100644
--- a/SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.inf
+++ b/Core/SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.inf
diff --git a/SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.uni b/Core/SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.uni
index 8cfa8b08db..8cfa8b08db 100644
--- a/SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.uni
+++ b/Core/SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.uni
diff --git a/SecurityPkg/Library/SmmTcg2PhysicalPresenceLib/SmmTcg2PhysicalPresenceLib.c b/Core/SecurityPkg/Library/SmmTcg2PhysicalPresenceLib/SmmTcg2PhysicalPresenceLib.c
index ba4db1113a..ba4db1113a 100644
--- a/SecurityPkg/Library/SmmTcg2PhysicalPresenceLib/SmmTcg2PhysicalPresenceLib.c
+++ b/Core/SecurityPkg/Library/SmmTcg2PhysicalPresenceLib/SmmTcg2PhysicalPresenceLib.c
diff --git a/SecurityPkg/Library/SmmTcg2PhysicalPresenceLib/SmmTcg2PhysicalPresenceLib.inf b/Core/SecurityPkg/Library/SmmTcg2PhysicalPresenceLib/SmmTcg2PhysicalPresenceLib.inf
index 5fa84b1024..5fa84b1024 100644
--- a/SecurityPkg/Library/SmmTcg2PhysicalPresenceLib/SmmTcg2PhysicalPresenceLib.inf
+++ b/Core/SecurityPkg/Library/SmmTcg2PhysicalPresenceLib/SmmTcg2PhysicalPresenceLib.inf
diff --git a/SecurityPkg/Library/SmmTcg2PhysicalPresenceLib/SmmTcg2PhysicalPresenceLib.uni b/Core/SecurityPkg/Library/SmmTcg2PhysicalPresenceLib/SmmTcg2PhysicalPresenceLib.uni
index 268db455d9..268db455d9 100644
--- a/SecurityPkg/Library/SmmTcg2PhysicalPresenceLib/SmmTcg2PhysicalPresenceLib.uni
+++ b/Core/SecurityPkg/Library/SmmTcg2PhysicalPresenceLib/SmmTcg2PhysicalPresenceLib.uni
diff --git a/SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.c b/Core/SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.c
index 93cb312d90..93cb312d90 100644
--- a/SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.c
+++ b/Core/SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.c
diff --git a/SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.inf b/Core/SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.inf
index f953fe95a7..f953fe95a7 100644
--- a/SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.inf
+++ b/Core/SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.inf
diff --git a/SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.uni b/Core/SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.uni
index 9423bac31d..9423bac31d 100644
--- a/SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.uni
+++ b/Core/SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.uni
diff --git a/SecurityPkg/Library/TcgPpVendorLibNull/TcgPpVendorLibNull.c b/Core/SecurityPkg/Library/TcgPpVendorLibNull/TcgPpVendorLibNull.c
index ddd6d727cc..ddd6d727cc 100644
--- a/SecurityPkg/Library/TcgPpVendorLibNull/TcgPpVendorLibNull.c
+++ b/Core/SecurityPkg/Library/TcgPpVendorLibNull/TcgPpVendorLibNull.c
diff --git a/SecurityPkg/Library/TcgPpVendorLibNull/TcgPpVendorLibNull.inf b/Core/SecurityPkg/Library/TcgPpVendorLibNull/TcgPpVendorLibNull.inf
index 9674386abd..9674386abd 100644
--- a/SecurityPkg/Library/TcgPpVendorLibNull/TcgPpVendorLibNull.inf
+++ b/Core/SecurityPkg/Library/TcgPpVendorLibNull/TcgPpVendorLibNull.inf
diff --git a/SecurityPkg/Library/TcgPpVendorLibNull/TcgPpVendorLibNull.uni b/Core/SecurityPkg/Library/TcgPpVendorLibNull/TcgPpVendorLibNull.uni
index 2fd967cb97..2fd967cb97 100644
--- a/SecurityPkg/Library/TcgPpVendorLibNull/TcgPpVendorLibNull.uni
+++ b/Core/SecurityPkg/Library/TcgPpVendorLibNull/TcgPpVendorLibNull.uni
diff --git a/SecurityPkg/Library/TcgStorageCoreLib/TcgStorageCore.c b/Core/SecurityPkg/Library/TcgStorageCoreLib/TcgStorageCore.c
index 76b25a3775..76b25a3775 100644
--- a/SecurityPkg/Library/TcgStorageCoreLib/TcgStorageCore.c
+++ b/Core/SecurityPkg/Library/TcgStorageCoreLib/TcgStorageCore.c
diff --git a/SecurityPkg/Library/TcgStorageCoreLib/TcgStorageCoreLib.inf b/Core/SecurityPkg/Library/TcgStorageCoreLib/TcgStorageCoreLib.inf
index a80cb00a9c..a80cb00a9c 100644
--- a/SecurityPkg/Library/TcgStorageCoreLib/TcgStorageCoreLib.inf
+++ b/Core/SecurityPkg/Library/TcgStorageCoreLib/TcgStorageCoreLib.inf
diff --git a/SecurityPkg/Library/TcgStorageCoreLib/TcgStorageUtil.c b/Core/SecurityPkg/Library/TcgStorageCoreLib/TcgStorageUtil.c
index 286f5b6bda..286f5b6bda 100644
--- a/SecurityPkg/Library/TcgStorageCoreLib/TcgStorageUtil.c
+++ b/Core/SecurityPkg/Library/TcgStorageCoreLib/TcgStorageUtil.c
diff --git a/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalCore.c b/Core/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalCore.c
index 90cc51a24c..90cc51a24c 100644
--- a/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalCore.c
+++ b/Core/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalCore.c
diff --git a/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalLib.inf b/Core/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalLib.inf
index ec26111ee2..ec26111ee2 100644
--- a/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalLib.inf
+++ b/Core/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalLib.inf
diff --git a/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalUtil.c b/Core/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalUtil.c
index f77fbe25c1..f77fbe25c1 100644
--- a/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalUtil.c
+++ b/Core/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalUtil.c
diff --git a/SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf b/Core/SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf
index f5dbb721b8..f5dbb721b8 100644
--- a/SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf
+++ b/Core/SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf
diff --git a/SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.uni b/Core/SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.uni
index 5aeb1b2c5c..5aeb1b2c5c 100644
--- a/SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.uni
+++ b/Core/SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.uni
diff --git a/SecurityPkg/Library/Tpm12CommandLib/Tpm12GetCapability.c b/Core/SecurityPkg/Library/Tpm12CommandLib/Tpm12GetCapability.c
index c6eb9e1050..c6eb9e1050 100644
--- a/SecurityPkg/Library/Tpm12CommandLib/Tpm12GetCapability.c
+++ b/Core/SecurityPkg/Library/Tpm12CommandLib/Tpm12GetCapability.c
diff --git a/SecurityPkg/Library/Tpm12CommandLib/Tpm12NvStorage.c b/Core/SecurityPkg/Library/Tpm12CommandLib/Tpm12NvStorage.c
index e176b00f6b..e176b00f6b 100644
--- a/SecurityPkg/Library/Tpm12CommandLib/Tpm12NvStorage.c
+++ b/Core/SecurityPkg/Library/Tpm12CommandLib/Tpm12NvStorage.c
diff --git a/SecurityPkg/Library/Tpm12CommandLib/Tpm12Ownership.c b/Core/SecurityPkg/Library/Tpm12CommandLib/Tpm12Ownership.c
index 0b1bf5c536..0b1bf5c536 100644
--- a/SecurityPkg/Library/Tpm12CommandLib/Tpm12Ownership.c
+++ b/Core/SecurityPkg/Library/Tpm12CommandLib/Tpm12Ownership.c
diff --git a/SecurityPkg/Library/Tpm12CommandLib/Tpm12Pcr.c b/Core/SecurityPkg/Library/Tpm12CommandLib/Tpm12Pcr.c
index 18d5b96e6f..18d5b96e6f 100644
--- a/SecurityPkg/Library/Tpm12CommandLib/Tpm12Pcr.c
+++ b/Core/SecurityPkg/Library/Tpm12CommandLib/Tpm12Pcr.c
diff --git a/SecurityPkg/Library/Tpm12CommandLib/Tpm12PhysicalPresence.c b/Core/SecurityPkg/Library/Tpm12CommandLib/Tpm12PhysicalPresence.c
index d8d1998d4b..d8d1998d4b 100644
--- a/SecurityPkg/Library/Tpm12CommandLib/Tpm12PhysicalPresence.c
+++ b/Core/SecurityPkg/Library/Tpm12CommandLib/Tpm12PhysicalPresence.c
diff --git a/SecurityPkg/Library/Tpm12CommandLib/Tpm12SelfTest.c b/Core/SecurityPkg/Library/Tpm12CommandLib/Tpm12SelfTest.c
index 579fed722b..579fed722b 100644
--- a/SecurityPkg/Library/Tpm12CommandLib/Tpm12SelfTest.c
+++ b/Core/SecurityPkg/Library/Tpm12CommandLib/Tpm12SelfTest.c
diff --git a/SecurityPkg/Library/Tpm12CommandLib/Tpm12Startup.c b/Core/SecurityPkg/Library/Tpm12CommandLib/Tpm12Startup.c
index 098dd28dc1..098dd28dc1 100644
--- a/SecurityPkg/Library/Tpm12CommandLib/Tpm12Startup.c
+++ b/Core/SecurityPkg/Library/Tpm12CommandLib/Tpm12Startup.c
diff --git a/SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf b/Core/SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf
index 30b399499e..30b399499e 100644
--- a/SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf
+++ b/Core/SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf
diff --git a/SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.uni b/Core/SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.uni
index dd98a407ee..dd98a407ee 100644
--- a/SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.uni
+++ b/Core/SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.uni
diff --git a/SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12Tis.c b/Core/SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12Tis.c
index c392b4b215..c392b4b215 100644
--- a/SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12Tis.c
+++ b/Core/SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12Tis.c
diff --git a/SecurityPkg/Library/Tpm12DeviceLibTcg/Tpm12DeviceLibTcg.c b/Core/SecurityPkg/Library/Tpm12DeviceLibTcg/Tpm12DeviceLibTcg.c
index 126ec06cbd..126ec06cbd 100644
--- a/SecurityPkg/Library/Tpm12DeviceLibTcg/Tpm12DeviceLibTcg.c
+++ b/Core/SecurityPkg/Library/Tpm12DeviceLibTcg/Tpm12DeviceLibTcg.c
diff --git a/SecurityPkg/Library/Tpm12DeviceLibTcg/Tpm12DeviceLibTcg.inf b/Core/SecurityPkg/Library/Tpm12DeviceLibTcg/Tpm12DeviceLibTcg.inf
index 76ea4924a4..76ea4924a4 100644
--- a/SecurityPkg/Library/Tpm12DeviceLibTcg/Tpm12DeviceLibTcg.inf
+++ b/Core/SecurityPkg/Library/Tpm12DeviceLibTcg/Tpm12DeviceLibTcg.inf
diff --git a/SecurityPkg/Library/Tpm12DeviceLibTcg/Tpm12DeviceLibTcg.uni b/Core/SecurityPkg/Library/Tpm12DeviceLibTcg/Tpm12DeviceLibTcg.uni
index 23242658d1..23242658d1 100644
--- a/SecurityPkg/Library/Tpm12DeviceLibTcg/Tpm12DeviceLibTcg.uni
+++ b/Core/SecurityPkg/Library/Tpm12DeviceLibTcg/Tpm12DeviceLibTcg.uni
diff --git a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Capability.c b/Core/SecurityPkg/Library/Tpm2CommandLib/Tpm2Capability.c
index 79e80fb7a9..79e80fb7a9 100644
--- a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Capability.c
+++ b/Core/SecurityPkg/Library/Tpm2CommandLib/Tpm2Capability.c
diff --git a/SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf b/Core/SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf
index 481a878671..481a878671 100644
--- a/SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf
+++ b/Core/SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf
diff --git a/SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.uni b/Core/SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.uni
index 9009e32787..9009e32787 100644
--- a/SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.uni
+++ b/Core/SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.uni
diff --git a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Context.c b/Core/SecurityPkg/Library/Tpm2CommandLib/Tpm2Context.c
index 02a250127a..02a250127a 100644
--- a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Context.c
+++ b/Core/SecurityPkg/Library/Tpm2CommandLib/Tpm2Context.c
diff --git a/SecurityPkg/Library/Tpm2CommandLib/Tpm2DictionaryAttack.c b/Core/SecurityPkg/Library/Tpm2CommandLib/Tpm2DictionaryAttack.c
index 3198b8a4b8..3198b8a4b8 100644
--- a/SecurityPkg/Library/Tpm2CommandLib/Tpm2DictionaryAttack.c
+++ b/Core/SecurityPkg/Library/Tpm2CommandLib/Tpm2DictionaryAttack.c
diff --git a/SecurityPkg/Library/Tpm2CommandLib/Tpm2EnhancedAuthorization.c b/Core/SecurityPkg/Library/Tpm2CommandLib/Tpm2EnhancedAuthorization.c
index 6f6b3693f8..6f6b3693f8 100644
--- a/SecurityPkg/Library/Tpm2CommandLib/Tpm2EnhancedAuthorization.c
+++ b/Core/SecurityPkg/Library/Tpm2CommandLib/Tpm2EnhancedAuthorization.c
diff --git a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Help.c b/Core/SecurityPkg/Library/Tpm2CommandLib/Tpm2Help.c
index 180f360830..180f360830 100644
--- a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Help.c
+++ b/Core/SecurityPkg/Library/Tpm2CommandLib/Tpm2Help.c
diff --git a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Hierarchy.c b/Core/SecurityPkg/Library/Tpm2CommandLib/Tpm2Hierarchy.c
index 9bfbdad394..9bfbdad394 100644
--- a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Hierarchy.c
+++ b/Core/SecurityPkg/Library/Tpm2CommandLib/Tpm2Hierarchy.c
diff --git a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Integrity.c b/Core/SecurityPkg/Library/Tpm2CommandLib/Tpm2Integrity.c
index 8eacfe6c13..8eacfe6c13 100644
--- a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Integrity.c
+++ b/Core/SecurityPkg/Library/Tpm2CommandLib/Tpm2Integrity.c
diff --git a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Miscellaneous.c b/Core/SecurityPkg/Library/Tpm2CommandLib/Tpm2Miscellaneous.c
index 5bd870fb9e..5bd870fb9e 100644
--- a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Miscellaneous.c
+++ b/Core/SecurityPkg/Library/Tpm2CommandLib/Tpm2Miscellaneous.c
diff --git a/SecurityPkg/Library/Tpm2CommandLib/Tpm2NVStorage.c b/Core/SecurityPkg/Library/Tpm2CommandLib/Tpm2NVStorage.c
index 9508022132..9508022132 100644
--- a/SecurityPkg/Library/Tpm2CommandLib/Tpm2NVStorage.c
+++ b/Core/SecurityPkg/Library/Tpm2CommandLib/Tpm2NVStorage.c
diff --git a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Object.c b/Core/SecurityPkg/Library/Tpm2CommandLib/Tpm2Object.c
index e070ff2f74..e070ff2f74 100644
--- a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Object.c
+++ b/Core/SecurityPkg/Library/Tpm2CommandLib/Tpm2Object.c
diff --git a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Sequences.c b/Core/SecurityPkg/Library/Tpm2CommandLib/Tpm2Sequences.c
index 305b6f2078..305b6f2078 100644
--- a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Sequences.c
+++ b/Core/SecurityPkg/Library/Tpm2CommandLib/Tpm2Sequences.c
diff --git a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Session.c b/Core/SecurityPkg/Library/Tpm2CommandLib/Tpm2Session.c
index f03b6689ac..f03b6689ac 100644
--- a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Session.c
+++ b/Core/SecurityPkg/Library/Tpm2CommandLib/Tpm2Session.c
diff --git a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Startup.c b/Core/SecurityPkg/Library/Tpm2CommandLib/Tpm2Startup.c
index dc2c5628f9..dc2c5628f9 100644
--- a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Startup.c
+++ b/Core/SecurityPkg/Library/Tpm2CommandLib/Tpm2Startup.c
diff --git a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Test.c b/Core/SecurityPkg/Library/Tpm2CommandLib/Tpm2Test.c
index 453351bfb3..453351bfb3 100644
--- a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Test.c
+++ b/Core/SecurityPkg/Library/Tpm2CommandLib/Tpm2Test.c
diff --git a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.c b/Core/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.c
index 0b1723e4a1..0b1723e4a1 100644
--- a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.c
+++ b/Core/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.c
diff --git a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf b/Core/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf
index 976972d98d..976972d98d 100644
--- a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf
+++ b/Core/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf
diff --git a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.uni b/Core/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.uni
index 94180ffd27..94180ffd27 100644
--- a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.uni
+++ b/Core/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.uni
diff --git a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.c b/Core/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.c
index 3f28f21faa..3f28f21faa 100644
--- a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.c
+++ b/Core/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.c
diff --git a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf b/Core/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf
index 22efb1ef4c..22efb1ef4c 100644
--- a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf
+++ b/Core/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf
diff --git a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.uni b/Core/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.uni
index 96bb2ad163..96bb2ad163 100644
--- a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.uni
+++ b/Core/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.uni
diff --git a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Ptp.c b/Core/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Ptp.c
index ddd4bd00b4..ddd4bd00b4 100644
--- a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Ptp.c
+++ b/Core/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Ptp.c
diff --git a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Tis.c b/Core/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Tis.c
index 6cd7030df2..6cd7030df2 100644
--- a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Tis.c
+++ b/Core/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Tis.c
diff --git a/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.c b/Core/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.c
index eedc439228..eedc439228 100644
--- a/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.c
+++ b/Core/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.c
diff --git a/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf b/Core/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf
index 28f381c7be..28f381c7be 100644
--- a/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf
+++ b/Core/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf
diff --git a/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.uni b/Core/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.uni
index b6d59e4a27..b6d59e4a27 100644
--- a/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.uni
+++ b/Core/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.uni
diff --git a/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterPei.c b/Core/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterPei.c
index 7470fe347d..7470fe347d 100644
--- a/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterPei.c
+++ b/Core/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterPei.c
diff --git a/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterPei.inf b/Core/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterPei.inf
index 2eca146dd2..2eca146dd2 100644
--- a/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterPei.inf
+++ b/Core/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterPei.inf
diff --git a/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterPei.uni b/Core/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterPei.uni
index b6d59e4a27..b6d59e4a27 100644
--- a/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterPei.uni
+++ b/Core/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterPei.uni
diff --git a/SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.c b/Core/SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.c
index 1d59050a0b..1d59050a0b 100644
--- a/SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.c
+++ b/Core/SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.c
diff --git a/SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf b/Core/SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf
index 6d95ebdd50..6d95ebdd50 100644
--- a/SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf
+++ b/Core/SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf
diff --git a/SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.uni b/Core/SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.uni
index 83d4e04773..83d4e04773 100644
--- a/SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.uni
+++ b/Core/SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.uni
diff --git a/SecurityPkg/Library/Tpm2DeviceLibTrEE/Tpm2DeviceLibTrEE.c b/Core/SecurityPkg/Library/Tpm2DeviceLibTrEE/Tpm2DeviceLibTrEE.c
index dc7b270705..dc7b270705 100644
--- a/SecurityPkg/Library/Tpm2DeviceLibTrEE/Tpm2DeviceLibTrEE.c
+++ b/Core/SecurityPkg/Library/Tpm2DeviceLibTrEE/Tpm2DeviceLibTrEE.c
diff --git a/SecurityPkg/Library/Tpm2DeviceLibTrEE/Tpm2DeviceLibTrEE.inf b/Core/SecurityPkg/Library/Tpm2DeviceLibTrEE/Tpm2DeviceLibTrEE.inf
index 81195e6704..81195e6704 100644
--- a/SecurityPkg/Library/Tpm2DeviceLibTrEE/Tpm2DeviceLibTrEE.inf
+++ b/Core/SecurityPkg/Library/Tpm2DeviceLibTrEE/Tpm2DeviceLibTrEE.inf
diff --git a/SecurityPkg/Library/Tpm2DeviceLibTrEE/Tpm2DeviceLibTrEE.uni b/Core/SecurityPkg/Library/Tpm2DeviceLibTrEE/Tpm2DeviceLibTrEE.uni
index d6defd04c8..d6defd04c8 100644
--- a/SecurityPkg/Library/Tpm2DeviceLibTrEE/Tpm2DeviceLibTrEE.uni
+++ b/Core/SecurityPkg/Library/Tpm2DeviceLibTrEE/Tpm2DeviceLibTrEE.uni
diff --git a/SecurityPkg/Library/TpmCommLib/CommonHeader.h b/Core/SecurityPkg/Library/TpmCommLib/CommonHeader.h
index b8496c7276..b8496c7276 100644
--- a/SecurityPkg/Library/TpmCommLib/CommonHeader.h
+++ b/Core/SecurityPkg/Library/TpmCommLib/CommonHeader.h
diff --git a/SecurityPkg/Library/TpmCommLib/TisPc.c b/Core/SecurityPkg/Library/TpmCommLib/TisPc.c
index c157d41b72..c157d41b72 100644
--- a/SecurityPkg/Library/TpmCommLib/TisPc.c
+++ b/Core/SecurityPkg/Library/TpmCommLib/TisPc.c
diff --git a/SecurityPkg/Library/TpmCommLib/TpmComm.c b/Core/SecurityPkg/Library/TpmCommLib/TpmComm.c
index 3197f96a99..3197f96a99 100644
--- a/SecurityPkg/Library/TpmCommLib/TpmComm.c
+++ b/Core/SecurityPkg/Library/TpmCommLib/TpmComm.c
diff --git a/SecurityPkg/Library/TpmCommLib/TpmCommLib.inf b/Core/SecurityPkg/Library/TpmCommLib/TpmCommLib.inf
index 7f05f59711..7f05f59711 100644
--- a/SecurityPkg/Library/TpmCommLib/TpmCommLib.inf
+++ b/Core/SecurityPkg/Library/TpmCommLib/TpmCommLib.inf
diff --git a/SecurityPkg/Library/TpmCommLib/TpmCommLib.uni b/Core/SecurityPkg/Library/TpmCommLib/TpmCommLib.uni
index eb111cb4b7..eb111cb4b7 100644
--- a/SecurityPkg/Library/TpmCommLib/TpmCommLib.uni
+++ b/Core/SecurityPkg/Library/TpmCommLib/TpmCommLib.uni
diff --git a/SecurityPkg/Library/TrEEPpVendorLibNull/TrEEPpVendorLibNull.c b/Core/SecurityPkg/Library/TrEEPpVendorLibNull/TrEEPpVendorLibNull.c
index efd477ad19..efd477ad19 100644
--- a/SecurityPkg/Library/TrEEPpVendorLibNull/TrEEPpVendorLibNull.c
+++ b/Core/SecurityPkg/Library/TrEEPpVendorLibNull/TrEEPpVendorLibNull.c
diff --git a/SecurityPkg/Library/TrEEPpVendorLibNull/TrEEPpVendorLibNull.inf b/Core/SecurityPkg/Library/TrEEPpVendorLibNull/TrEEPpVendorLibNull.inf
index 81144e9b92..81144e9b92 100644
--- a/SecurityPkg/Library/TrEEPpVendorLibNull/TrEEPpVendorLibNull.inf
+++ b/Core/SecurityPkg/Library/TrEEPpVendorLibNull/TrEEPpVendorLibNull.inf
diff --git a/SecurityPkg/Library/TrEEPpVendorLibNull/TrEEPpVendorLibNull.uni b/Core/SecurityPkg/Library/TrEEPpVendorLibNull/TrEEPpVendorLibNull.uni
index 7463e8f635..7463e8f635 100644
--- a/SecurityPkg/Library/TrEEPpVendorLibNull/TrEEPpVendorLibNull.uni
+++ b/Core/SecurityPkg/Library/TrEEPpVendorLibNull/TrEEPpVendorLibNull.uni
diff --git a/SecurityPkg/License.txt b/Core/SecurityPkg/License.txt
index be68999be6..be68999be6 100644
--- a/SecurityPkg/License.txt
+++ b/Core/SecurityPkg/License.txt
diff --git a/SecurityPkg/Pkcs7Verify/Pkcs7VerifyDxe/Pkcs7VerifyDxe.c b/Core/SecurityPkg/Pkcs7Verify/Pkcs7VerifyDxe/Pkcs7VerifyDxe.c
index 07fdf552be..07fdf552be 100644
--- a/SecurityPkg/Pkcs7Verify/Pkcs7VerifyDxe/Pkcs7VerifyDxe.c
+++ b/Core/SecurityPkg/Pkcs7Verify/Pkcs7VerifyDxe/Pkcs7VerifyDxe.c
diff --git a/SecurityPkg/Pkcs7Verify/Pkcs7VerifyDxe/Pkcs7VerifyDxe.inf b/Core/SecurityPkg/Pkcs7Verify/Pkcs7VerifyDxe/Pkcs7VerifyDxe.inf
index db4de92a31..db4de92a31 100644
--- a/SecurityPkg/Pkcs7Verify/Pkcs7VerifyDxe/Pkcs7VerifyDxe.inf
+++ b/Core/SecurityPkg/Pkcs7Verify/Pkcs7VerifyDxe/Pkcs7VerifyDxe.inf
diff --git a/SecurityPkg/Pkcs7Verify/Pkcs7VerifyDxe/Pkcs7VerifyDxe.uni b/Core/SecurityPkg/Pkcs7Verify/Pkcs7VerifyDxe/Pkcs7VerifyDxe.uni
index ba18ed7ec6..ba18ed7ec6 100644
--- a/SecurityPkg/Pkcs7Verify/Pkcs7VerifyDxe/Pkcs7VerifyDxe.uni
+++ b/Core/SecurityPkg/Pkcs7Verify/Pkcs7VerifyDxe/Pkcs7VerifyDxe.uni
diff --git a/SecurityPkg/Pkcs7Verify/Pkcs7VerifyDxe/Pkcs7VerifyDxeExtra.uni b/Core/SecurityPkg/Pkcs7Verify/Pkcs7VerifyDxe/Pkcs7VerifyDxeExtra.uni
index 55ae8d066a..55ae8d066a 100644
--- a/SecurityPkg/Pkcs7Verify/Pkcs7VerifyDxe/Pkcs7VerifyDxeExtra.uni
+++ b/Core/SecurityPkg/Pkcs7Verify/Pkcs7VerifyDxe/Pkcs7VerifyDxeExtra.uni
diff --git a/SecurityPkg/RandomNumberGenerator/RngDxe/AesCore.c b/Core/SecurityPkg/RandomNumberGenerator/RngDxe/AesCore.c
index 13b424dc2e..13b424dc2e 100644
--- a/SecurityPkg/RandomNumberGenerator/RngDxe/AesCore.c
+++ b/Core/SecurityPkg/RandomNumberGenerator/RngDxe/AesCore.c
diff --git a/SecurityPkg/RandomNumberGenerator/RngDxe/AesCore.h b/Core/SecurityPkg/RandomNumberGenerator/RngDxe/AesCore.h
index 8279c61160..8279c61160 100644
--- a/SecurityPkg/RandomNumberGenerator/RngDxe/AesCore.h
+++ b/Core/SecurityPkg/RandomNumberGenerator/RngDxe/AesCore.h
diff --git a/SecurityPkg/RandomNumberGenerator/RngDxe/RdRand.c b/Core/SecurityPkg/RandomNumberGenerator/RngDxe/RdRand.c
index 395b8867c8..395b8867c8 100644
--- a/SecurityPkg/RandomNumberGenerator/RngDxe/RdRand.c
+++ b/Core/SecurityPkg/RandomNumberGenerator/RngDxe/RdRand.c
diff --git a/SecurityPkg/RandomNumberGenerator/RngDxe/RdRand.h b/Core/SecurityPkg/RandomNumberGenerator/RngDxe/RdRand.h
index d6378778cf..d6378778cf 100644
--- a/SecurityPkg/RandomNumberGenerator/RngDxe/RdRand.h
+++ b/Core/SecurityPkg/RandomNumberGenerator/RngDxe/RdRand.h
diff --git a/SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.c b/Core/SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.c
index 32c46ab45f..32c46ab45f 100644
--- a/SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.c
+++ b/Core/SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.c
diff --git a/SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf b/Core/SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf
index 4d668a170a..4d668a170a 100644
--- a/SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf
+++ b/Core/SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf
diff --git a/SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.uni b/Core/SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.uni
index 38f53c98a1..38f53c98a1 100644
--- a/SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.uni
+++ b/Core/SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.uni
diff --git a/SecurityPkg/RandomNumberGenerator/RngDxe/RngDxeExtra.uni b/Core/SecurityPkg/RandomNumberGenerator/RngDxe/RngDxeExtra.uni
index 1fdc7e2253..1fdc7e2253 100644
--- a/SecurityPkg/RandomNumberGenerator/RngDxe/RngDxeExtra.uni
+++ b/Core/SecurityPkg/RandomNumberGenerator/RngDxe/RngDxeExtra.uni
diff --git a/SecurityPkg/SecurityPkg.dec b/Core/SecurityPkg/SecurityPkg.dec
index db0c9ac7be..db0c9ac7be 100644
--- a/SecurityPkg/SecurityPkg.dec
+++ b/Core/SecurityPkg/SecurityPkg.dec
diff --git a/SecurityPkg/SecurityPkg.dsc b/Core/SecurityPkg/SecurityPkg.dsc
index dee92411d6..dee92411d6 100644
--- a/SecurityPkg/SecurityPkg.dsc
+++ b/Core/SecurityPkg/SecurityPkg.dsc
diff --git a/SecurityPkg/SecurityPkg.uni b/Core/SecurityPkg/SecurityPkg.uni
index 1263516240..1263516240 100644
--- a/SecurityPkg/SecurityPkg.uni
+++ b/Core/SecurityPkg/SecurityPkg.uni
diff --git a/SecurityPkg/SecurityPkgExtra.uni b/Core/SecurityPkg/SecurityPkgExtra.uni
index d52875dbc6..d52875dbc6 100644
--- a/SecurityPkg/SecurityPkgExtra.uni
+++ b/Core/SecurityPkg/SecurityPkgExtra.uni
diff --git a/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.c b/Core/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.c
index e691a084d0..e691a084d0 100644
--- a/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.c
+++ b/Core/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.c
diff --git a/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.h b/Core/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.h
index a4aae48a5f..a4aae48a5f 100644
--- a/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.h
+++ b/Core/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.h
diff --git a/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf b/Core/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf
index a131342bb6..a131342bb6 100644
--- a/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf
+++ b/Core/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf
diff --git a/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.uni b/Core/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.uni
index fc6d92ae98..fc6d92ae98 100644
--- a/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.uni
+++ b/Core/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.uni
diff --git a/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMorExtra.uni b/Core/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMorExtra.uni
index 7278fff4eb..7278fff4eb 100644
--- a/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMorExtra.uni
+++ b/Core/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMorExtra.uni
diff --git a/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.c b/Core/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.c
index c6f3edc756..c6f3edc756 100644
--- a/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.c
+++ b/Core/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.c
diff --git a/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.h b/Core/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.h
index 50a656aeb3..50a656aeb3 100644
--- a/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.h
+++ b/Core/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.h
diff --git a/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.uni b/Core/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.uni
index 2a40f9d006..2a40f9d006 100644
--- a/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.uni
+++ b/Core/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLock.uni
diff --git a/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLockExtra.uni b/Core/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLockExtra.uni
index 770092dafc..770092dafc 100644
--- a/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLockExtra.uni
+++ b/Core/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLockExtra.uni
diff --git a/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLockSmm.c b/Core/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLockSmm.c
index 019cb8bb24..019cb8bb24 100644
--- a/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLockSmm.c
+++ b/Core/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLockSmm.c
diff --git a/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLockSmm.inf b/Core/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLockSmm.inf
index 1623bd03bb..1623bd03bb 100644
--- a/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLockSmm.inf
+++ b/Core/SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLockSmm.inf
diff --git a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/ComponentName.c b/Core/SecurityPkg/Tcg/Opal/OpalPasswordDxe/ComponentName.c
index ef963d0e0b..ef963d0e0b 100644
--- a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/ComponentName.c
+++ b/Core/SecurityPkg/Tcg/Opal/OpalPasswordDxe/ComponentName.c
diff --git a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalDriver.c b/Core/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalDriver.c
index cd0c5a4096..cd0c5a4096 100644
--- a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalDriver.c
+++ b/Core/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalDriver.c
diff --git a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalDriver.h b/Core/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalDriver.h
index 7761d64cbb..7761d64cbb 100644
--- a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalDriver.h
+++ b/Core/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalDriver.h
diff --git a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalDriverPrivate.h b/Core/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalDriverPrivate.h
index 19ebc32623..19ebc32623 100644
--- a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalDriverPrivate.h
+++ b/Core/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalDriverPrivate.h
diff --git a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHii.c b/Core/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHii.c
index 4881e72c55..4881e72c55 100644
--- a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHii.c
+++ b/Core/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHii.c
diff --git a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHii.h b/Core/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHii.h
index c03f082780..c03f082780 100644
--- a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHii.h
+++ b/Core/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHii.h
diff --git a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHiiCallbacks.c b/Core/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHiiCallbacks.c
index 6f2eaeb4c3..6f2eaeb4c3 100644
--- a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHiiCallbacks.c
+++ b/Core/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHiiCallbacks.c
diff --git a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHiiFormStrings.uni b/Core/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHiiFormStrings.uni
index 4cfbde3f84..4cfbde3f84 100644
--- a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHiiFormStrings.uni
+++ b/Core/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHiiFormStrings.uni
diff --git a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHiiFormValues.h b/Core/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHiiFormValues.h
index 88cf9f5b59..88cf9f5b59 100644
--- a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHiiFormValues.h
+++ b/Core/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHiiFormValues.h
diff --git a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHiiPrivate.h b/Core/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHiiPrivate.h
index ec5a93cf3f..ec5a93cf3f 100644
--- a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHiiPrivate.h
+++ b/Core/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHiiPrivate.h
diff --git a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalPasswordDxe.inf b/Core/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalPasswordDxe.inf
index f2afc37810..f2afc37810 100644
--- a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalPasswordDxe.inf
+++ b/Core/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalPasswordDxe.inf
diff --git a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalPasswordForm.vfr b/Core/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalPasswordForm.vfr
index 218e0f442c..218e0f442c 100644
--- a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalPasswordForm.vfr
+++ b/Core/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalPasswordForm.vfr
diff --git a/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalAhciMode.c b/Core/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalAhciMode.c
index 33f77bd8a2..33f77bd8a2 100644
--- a/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalAhciMode.c
+++ b/Core/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalAhciMode.c
diff --git a/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalAhciMode.h b/Core/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalAhciMode.h
index 3a7f6331ca..3a7f6331ca 100644
--- a/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalAhciMode.h
+++ b/Core/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalAhciMode.h
diff --git a/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalIdeMode.c b/Core/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalIdeMode.c
index 76204625dd..76204625dd 100644
--- a/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalIdeMode.c
+++ b/Core/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalIdeMode.c
diff --git a/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalIdeMode.h b/Core/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalIdeMode.h
index ba94a97505..ba94a97505 100644
--- a/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalIdeMode.h
+++ b/Core/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalIdeMode.h
diff --git a/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalNvmeMode.c b/Core/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalNvmeMode.c
index a47d2764c3..a47d2764c3 100644
--- a/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalNvmeMode.c
+++ b/Core/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalNvmeMode.c
diff --git a/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalNvmeMode.h b/Core/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalNvmeMode.h
index bfa4f10413..bfa4f10413 100644
--- a/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalNvmeMode.h
+++ b/Core/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalNvmeMode.h
diff --git a/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalNvmeReg.h b/Core/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalNvmeReg.h
index b5460cd42e..b5460cd42e 100644
--- a/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalNvmeReg.h
+++ b/Core/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalNvmeReg.h
diff --git a/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalPasswordSmm.c b/Core/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalPasswordSmm.c
index 2f2a1d9c13..2f2a1d9c13 100644
--- a/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalPasswordSmm.c
+++ b/Core/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalPasswordSmm.c
diff --git a/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalPasswordSmm.h b/Core/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalPasswordSmm.h
index ab31a6bfe7..ab31a6bfe7 100644
--- a/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalPasswordSmm.h
+++ b/Core/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalPasswordSmm.h
diff --git a/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalPasswordSmm.inf b/Core/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalPasswordSmm.inf
index cab0fd5656..cab0fd5656 100644
--- a/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalPasswordSmm.inf
+++ b/Core/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalPasswordSmm.inf
diff --git a/SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.c b/Core/SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.c
index e694db8cf1..e694db8cf1 100644
--- a/SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.c
+++ b/Core/SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.c
diff --git a/SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf b/Core/SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf
index cac1abea34..cac1abea34 100644
--- a/SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf
+++ b/Core/SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf
diff --git a/SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.uni b/Core/SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.uni
index 8f701f6260..8f701f6260 100644
--- a/SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.uni
+++ b/Core/SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.uni
diff --git a/SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePeiExtra.uni b/Core/SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePeiExtra.uni
index 0fb38dba82..0fb38dba82 100644
--- a/SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePeiExtra.uni
+++ b/Core/SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePeiExtra.uni
diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2Config.vfr b/Core/SecurityPkg/Tcg/Tcg2Config/Tcg2Config.vfr
index 1d44c99109..1d44c99109 100644
--- a/SecurityPkg/Tcg/Tcg2Config/Tcg2Config.vfr
+++ b/Core/SecurityPkg/Tcg/Tcg2Config/Tcg2Config.vfr
diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDriver.c b/Core/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDriver.c
index 9c590dcb74..9c590dcb74 100644
--- a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDriver.c
+++ b/Core/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDriver.c
diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf b/Core/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf
index 38fa331701..38fa331701 100644
--- a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf
+++ b/Core/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf
diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.uni b/Core/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.uni
index ee7219ee5b..ee7219ee5b 100644
--- a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.uni
+++ b/Core/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.uni
diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxeExtra.uni b/Core/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxeExtra.uni
index 37f81e17bd..37f81e17bd 100644
--- a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxeExtra.uni
+++ b/Core/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxeExtra.uni
diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.c b/Core/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.c
index b3a849e918..b3a849e918 100644
--- a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.c
+++ b/Core/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.c
diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.h b/Core/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.h
index 504212baa8..504212baa8 100644
--- a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.h
+++ b/Core/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.h
diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigNvData.h b/Core/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigNvData.h
index 5960446421..5960446421 100644
--- a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigNvData.h
+++ b/Core/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigNvData.h
diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf b/Core/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf
index 8dd0b63e48..8dd0b63e48 100644
--- a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf
+++ b/Core/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf
diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.uni b/Core/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.uni
index 02eaf8faad..02eaf8faad 100644
--- a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.uni
+++ b/Core/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.uni
diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPeiExtra.uni b/Core/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPeiExtra.uni
index 37f81e17bd..37f81e17bd 100644
--- a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPeiExtra.uni
+++ b/Core/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPeiExtra.uni
diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c b/Core/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c
index 004c7efe70..004c7efe70 100644
--- a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c
+++ b/Core/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c
diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigStrings.uni b/Core/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigStrings.uni
index a7d62bcbe6..a7d62bcbe6 100644
--- a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigStrings.uni
+++ b/Core/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigStrings.uni
diff --git a/SecurityPkg/Tcg/Tcg2Config/TpmDetection.c b/Core/SecurityPkg/Tcg/Tcg2Config/TpmDetection.c
index 7e6ca44205..7e6ca44205 100644
--- a/SecurityPkg/Tcg/Tcg2Config/TpmDetection.c
+++ b/Core/SecurityPkg/Tcg/Tcg2Config/TpmDetection.c
diff --git a/SecurityPkg/Tcg/Tcg2Dxe/MeasureBootPeCoff.c b/Core/SecurityPkg/Tcg/Tcg2Dxe/MeasureBootPeCoff.c
index 8ee34a702e..8ee34a702e 100644
--- a/SecurityPkg/Tcg/Tcg2Dxe/MeasureBootPeCoff.c
+++ b/Core/SecurityPkg/Tcg/Tcg2Dxe/MeasureBootPeCoff.c
diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c b/Core/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
index c2c52e32b8..c2c52e32b8 100644
--- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
+++ b/Core/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf b/Core/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf
index 8efc4e3aad..8efc4e3aad 100644
--- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf
+++ b/Core/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf
diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.uni b/Core/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.uni
index dadcd1a79e..dadcd1a79e 100644
--- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.uni
+++ b/Core/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.uni
diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2DxeExtra.uni b/Core/SecurityPkg/Tcg/Tcg2Dxe/Tcg2DxeExtra.uni
index 1cd59a33a3..1cd59a33a3 100644
--- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2DxeExtra.uni
+++ b/Core/SecurityPkg/Tcg/Tcg2Dxe/Tcg2DxeExtra.uni
diff --git a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c b/Core/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
index 69adad43aa..69adad43aa 100644
--- a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
+++ b/Core/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
diff --git a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf b/Core/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf
index 3477d8206a..3477d8206a 100644
--- a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf
+++ b/Core/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf
diff --git a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.uni b/Core/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.uni
index 4622dffaa8..4622dffaa8 100644
--- a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.uni
+++ b/Core/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.uni
diff --git a/SecurityPkg/Tcg/Tcg2Pei/Tcg2PeiExtra.uni b/Core/SecurityPkg/Tcg/Tcg2Pei/Tcg2PeiExtra.uni
index dea6dcc0e3..dea6dcc0e3 100644
--- a/SecurityPkg/Tcg/Tcg2Pei/Tcg2PeiExtra.uni
+++ b/Core/SecurityPkg/Tcg/Tcg2Pei/Tcg2PeiExtra.uni
diff --git a/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.c b/Core/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.c
index 5a1fd3e363..5a1fd3e363 100644
--- a/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.c
+++ b/Core/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.c
diff --git a/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.h b/Core/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.h
index 100804cf2a..100804cf2a 100644
--- a/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.h
+++ b/Core/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.h
diff --git a/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.inf b/Core/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.inf
index c4efa2a188..c4efa2a188 100644
--- a/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.inf
+++ b/Core/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.inf
diff --git a/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.uni b/Core/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.uni
index 297e71a06d..297e71a06d 100644
--- a/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.uni
+++ b/Core/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.uni
diff --git a/SecurityPkg/Tcg/Tcg2Smm/Tcg2SmmExtra.uni b/Core/SecurityPkg/Tcg/Tcg2Smm/Tcg2SmmExtra.uni
index e2a7b1d02f..e2a7b1d02f 100644
--- a/SecurityPkg/Tcg/Tcg2Smm/Tcg2SmmExtra.uni
+++ b/Core/SecurityPkg/Tcg/Tcg2Smm/Tcg2SmmExtra.uni
diff --git a/SecurityPkg/Tcg/Tcg2Smm/Tpm.asl b/Core/SecurityPkg/Tcg/Tcg2Smm/Tpm.asl
index cf0642e104..cf0642e104 100644
--- a/SecurityPkg/Tcg/Tcg2Smm/Tpm.asl
+++ b/Core/SecurityPkg/Tcg/Tcg2Smm/Tpm.asl
diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfig.vfr b/Core/SecurityPkg/Tcg/TcgConfigDxe/TcgConfig.vfr
index 94e3229e88..94e3229e88 100644
--- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfig.vfr
+++ b/Core/SecurityPkg/Tcg/TcgConfigDxe/TcgConfig.vfr
diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDriver.c b/Core/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDriver.c
index a9d3105456..a9d3105456 100644
--- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDriver.c
+++ b/Core/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDriver.c
diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf b/Core/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf
index 82fc35eea0..82fc35eea0 100644
--- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf
+++ b/Core/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf
diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.uni b/Core/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.uni
index c308271c0d..c308271c0d 100644
--- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.uni
+++ b/Core/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.uni
diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxeExtra.uni b/Core/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxeExtra.uni
index 2856bf1d40..2856bf1d40 100644
--- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxeExtra.uni
+++ b/Core/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxeExtra.uni
diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c b/Core/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c
index 7fa5611cfd..7fa5611cfd 100644
--- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c
+++ b/Core/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c
diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.h b/Core/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.h
index a03abaa1dd..a03abaa1dd 100644
--- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.h
+++ b/Core/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.h
diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigNvData.h b/Core/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigNvData.h
index eaa6fe8018..eaa6fe8018 100644
--- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigNvData.h
+++ b/Core/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigNvData.h
diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigStrings.uni b/Core/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigStrings.uni
index fd8458dc00..fd8458dc00 100644
--- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigStrings.uni
+++ b/Core/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigStrings.uni
diff --git a/SecurityPkg/Tcg/TcgDxe/TcgDxe.c b/Core/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
index 5b7c5c3e16..5b7c5c3e16 100644
--- a/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
+++ b/Core/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
diff --git a/SecurityPkg/Tcg/TcgDxe/TcgDxe.inf b/Core/SecurityPkg/Tcg/TcgDxe/TcgDxe.inf
index 1b96ecbe2a..1b96ecbe2a 100644
--- a/SecurityPkg/Tcg/TcgDxe/TcgDxe.inf
+++ b/Core/SecurityPkg/Tcg/TcgDxe/TcgDxe.inf
diff --git a/SecurityPkg/Tcg/TcgDxe/TcgDxe.uni b/Core/SecurityPkg/Tcg/TcgDxe/TcgDxe.uni
index d8e9b91edf..d8e9b91edf 100644
--- a/SecurityPkg/Tcg/TcgDxe/TcgDxe.uni
+++ b/Core/SecurityPkg/Tcg/TcgDxe/TcgDxe.uni
diff --git a/SecurityPkg/Tcg/TcgDxe/TcgDxeExtra.uni b/Core/SecurityPkg/Tcg/TcgDxe/TcgDxeExtra.uni
index f6f8b634e0..f6f8b634e0 100644
--- a/SecurityPkg/Tcg/TcgDxe/TcgDxeExtra.uni
+++ b/Core/SecurityPkg/Tcg/TcgDxe/TcgDxeExtra.uni
diff --git a/SecurityPkg/Tcg/TcgPei/TcgPei.c b/Core/SecurityPkg/Tcg/TcgPei/TcgPei.c
index 63807f44ff..63807f44ff 100644
--- a/SecurityPkg/Tcg/TcgPei/TcgPei.c
+++ b/Core/SecurityPkg/Tcg/TcgPei/TcgPei.c
diff --git a/SecurityPkg/Tcg/TcgPei/TcgPei.inf b/Core/SecurityPkg/Tcg/TcgPei/TcgPei.inf
index 9a44d8fbda..9a44d8fbda 100644
--- a/SecurityPkg/Tcg/TcgPei/TcgPei.inf
+++ b/Core/SecurityPkg/Tcg/TcgPei/TcgPei.inf
diff --git a/SecurityPkg/Tcg/TcgPei/TcgPei.uni b/Core/SecurityPkg/Tcg/TcgPei/TcgPei.uni
index b2d2d5c1c1..b2d2d5c1c1 100644
--- a/SecurityPkg/Tcg/TcgPei/TcgPei.uni
+++ b/Core/SecurityPkg/Tcg/TcgPei/TcgPei.uni
diff --git a/SecurityPkg/Tcg/TcgPei/TcgPeiExtra.uni b/Core/SecurityPkg/Tcg/TcgPei/TcgPeiExtra.uni
index e469d984c8..e469d984c8 100644
--- a/SecurityPkg/Tcg/TcgPei/TcgPeiExtra.uni
+++ b/Core/SecurityPkg/Tcg/TcgPei/TcgPeiExtra.uni
diff --git a/SecurityPkg/Tcg/TcgSmm/TcgSmm.c b/Core/SecurityPkg/Tcg/TcgSmm/TcgSmm.c
index 589bab694b..589bab694b 100644
--- a/SecurityPkg/Tcg/TcgSmm/TcgSmm.c
+++ b/Core/SecurityPkg/Tcg/TcgSmm/TcgSmm.c
diff --git a/SecurityPkg/Tcg/TcgSmm/TcgSmm.h b/Core/SecurityPkg/Tcg/TcgSmm/TcgSmm.h
index 21e4ad96d2..21e4ad96d2 100644
--- a/SecurityPkg/Tcg/TcgSmm/TcgSmm.h
+++ b/Core/SecurityPkg/Tcg/TcgSmm/TcgSmm.h
diff --git a/SecurityPkg/Tcg/TcgSmm/TcgSmm.inf b/Core/SecurityPkg/Tcg/TcgSmm/TcgSmm.inf
index be7a96bc62..be7a96bc62 100644
--- a/SecurityPkg/Tcg/TcgSmm/TcgSmm.inf
+++ b/Core/SecurityPkg/Tcg/TcgSmm/TcgSmm.inf
diff --git a/SecurityPkg/Tcg/TcgSmm/TcgSmm.uni b/Core/SecurityPkg/Tcg/TcgSmm/TcgSmm.uni
index 81f7f8d53a..81f7f8d53a 100644
--- a/SecurityPkg/Tcg/TcgSmm/TcgSmm.uni
+++ b/Core/SecurityPkg/Tcg/TcgSmm/TcgSmm.uni
diff --git a/SecurityPkg/Tcg/TcgSmm/TcgSmmExtra.uni b/Core/SecurityPkg/Tcg/TcgSmm/TcgSmmExtra.uni
index b9ca98bb6e..b9ca98bb6e 100644
--- a/SecurityPkg/Tcg/TcgSmm/TcgSmmExtra.uni
+++ b/Core/SecurityPkg/Tcg/TcgSmm/TcgSmmExtra.uni
diff --git a/SecurityPkg/Tcg/TcgSmm/Tpm.asl b/Core/SecurityPkg/Tcg/TcgSmm/Tpm.asl
index b5449d98b4..b5449d98b4 100644
--- a/SecurityPkg/Tcg/TcgSmm/Tpm.asl
+++ b/Core/SecurityPkg/Tcg/TcgSmm/Tpm.asl
diff --git a/SecurityPkg/Tcg/TrEEConfig/TpmDetection.c b/Core/SecurityPkg/Tcg/TrEEConfig/TpmDetection.c
index 4e675d3602..4e675d3602 100644
--- a/SecurityPkg/Tcg/TrEEConfig/TpmDetection.c
+++ b/Core/SecurityPkg/Tcg/TrEEConfig/TpmDetection.c
diff --git a/SecurityPkg/Tcg/TrEEConfig/TrEEConfig.vfr b/Core/SecurityPkg/Tcg/TrEEConfig/TrEEConfig.vfr
index 84b55a9f15..84b55a9f15 100644
--- a/SecurityPkg/Tcg/TrEEConfig/TrEEConfig.vfr
+++ b/Core/SecurityPkg/Tcg/TrEEConfig/TrEEConfig.vfr
diff --git a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigDriver.c b/Core/SecurityPkg/Tcg/TrEEConfig/TrEEConfigDriver.c
index 2ad02c05a6..2ad02c05a6 100644
--- a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigDriver.c
+++ b/Core/SecurityPkg/Tcg/TrEEConfig/TrEEConfigDriver.c
diff --git a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigDxe.inf b/Core/SecurityPkg/Tcg/TrEEConfig/TrEEConfigDxe.inf
index 368570aea0..368570aea0 100644
--- a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigDxe.inf
+++ b/Core/SecurityPkg/Tcg/TrEEConfig/TrEEConfigDxe.inf
diff --git a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigDxe.uni b/Core/SecurityPkg/Tcg/TrEEConfig/TrEEConfigDxe.uni
index 6b84586b2c..6b84586b2c 100644
--- a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigDxe.uni
+++ b/Core/SecurityPkg/Tcg/TrEEConfig/TrEEConfigDxe.uni
diff --git a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigDxeExtra.uni b/Core/SecurityPkg/Tcg/TrEEConfig/TrEEConfigDxeExtra.uni
index c1b243e563..c1b243e563 100644
--- a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigDxeExtra.uni
+++ b/Core/SecurityPkg/Tcg/TrEEConfig/TrEEConfigDxeExtra.uni
diff --git a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigImpl.c b/Core/SecurityPkg/Tcg/TrEEConfig/TrEEConfigImpl.c
index 2f03adcc8c..2f03adcc8c 100644
--- a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigImpl.c
+++ b/Core/SecurityPkg/Tcg/TrEEConfig/TrEEConfigImpl.c
diff --git a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigImpl.h b/Core/SecurityPkg/Tcg/TrEEConfig/TrEEConfigImpl.h
index 720c698e7a..720c698e7a 100644
--- a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigImpl.h
+++ b/Core/SecurityPkg/Tcg/TrEEConfig/TrEEConfigImpl.h
diff --git a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigNvData.h b/Core/SecurityPkg/Tcg/TrEEConfig/TrEEConfigNvData.h
index 14e5d926a1..14e5d926a1 100644
--- a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigNvData.h
+++ b/Core/SecurityPkg/Tcg/TrEEConfig/TrEEConfigNvData.h
diff --git a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf b/Core/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf
index a4d6b58c6a..a4d6b58c6a 100644
--- a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf
+++ b/Core/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf
diff --git a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.uni b/Core/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.uni
index 7050be29a4..7050be29a4 100644
--- a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.uni
+++ b/Core/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.uni
diff --git a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPeiExtra.uni b/Core/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPeiExtra.uni
index 1ebef052c3..1ebef052c3 100644
--- a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPeiExtra.uni
+++ b/Core/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPeiExtra.uni
diff --git a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPeim.c b/Core/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPeim.c
index b4a3d52347..b4a3d52347 100644
--- a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPeim.c
+++ b/Core/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPeim.c
diff --git a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigStrings.uni b/Core/SecurityPkg/Tcg/TrEEConfig/TrEEConfigStrings.uni
index 41d6c2412f..41d6c2412f 100644
--- a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigStrings.uni
+++ b/Core/SecurityPkg/Tcg/TrEEConfig/TrEEConfigStrings.uni
diff --git a/SecurityPkg/Tcg/TrEEDxe/MeasureBootPeCoff.c b/Core/SecurityPkg/Tcg/TrEEDxe/MeasureBootPeCoff.c
index a7de5883cc..a7de5883cc 100644
--- a/SecurityPkg/Tcg/TrEEDxe/MeasureBootPeCoff.c
+++ b/Core/SecurityPkg/Tcg/TrEEDxe/MeasureBootPeCoff.c
diff --git a/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.c b/Core/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.c
index 95e9d745ad..95e9d745ad 100644
--- a/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.c
+++ b/Core/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.c
diff --git a/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.inf b/Core/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.inf
index 2dd038aba3..2dd038aba3 100644
--- a/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.inf
+++ b/Core/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.inf
diff --git a/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.uni b/Core/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.uni
index fd7292d3a8..fd7292d3a8 100644
--- a/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.uni
+++ b/Core/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.uni
diff --git a/SecurityPkg/Tcg/TrEEDxe/TrEEDxeExtra.uni b/Core/SecurityPkg/Tcg/TrEEDxe/TrEEDxeExtra.uni
index 2ca23ebab7..2ca23ebab7 100644
--- a/SecurityPkg/Tcg/TrEEDxe/TrEEDxeExtra.uni
+++ b/Core/SecurityPkg/Tcg/TrEEDxe/TrEEDxeExtra.uni
diff --git a/SecurityPkg/Tcg/TrEEPei/TrEEPei.c b/Core/SecurityPkg/Tcg/TrEEPei/TrEEPei.c
index b561245790..b561245790 100644
--- a/SecurityPkg/Tcg/TrEEPei/TrEEPei.c
+++ b/Core/SecurityPkg/Tcg/TrEEPei/TrEEPei.c
diff --git a/SecurityPkg/Tcg/TrEEPei/TrEEPei.inf b/Core/SecurityPkg/Tcg/TrEEPei/TrEEPei.inf
index 61a8cd0824..61a8cd0824 100644
--- a/SecurityPkg/Tcg/TrEEPei/TrEEPei.inf
+++ b/Core/SecurityPkg/Tcg/TrEEPei/TrEEPei.inf
diff --git a/SecurityPkg/Tcg/TrEEPei/TrEEPei.uni b/Core/SecurityPkg/Tcg/TrEEPei/TrEEPei.uni
index 619484abfc..619484abfc 100644
--- a/SecurityPkg/Tcg/TrEEPei/TrEEPei.uni
+++ b/Core/SecurityPkg/Tcg/TrEEPei/TrEEPei.uni
diff --git a/SecurityPkg/Tcg/TrEEPei/TrEEPeiExtra.uni b/Core/SecurityPkg/Tcg/TrEEPei/TrEEPeiExtra.uni
index b6743ab953..b6743ab953 100644
--- a/SecurityPkg/Tcg/TrEEPei/TrEEPeiExtra.uni
+++ b/Core/SecurityPkg/Tcg/TrEEPei/TrEEPeiExtra.uni
diff --git a/SecurityPkg/Tcg/TrEESmm/Tpm.asl b/Core/SecurityPkg/Tcg/TrEESmm/Tpm.asl
index 0f6b94a23d..0f6b94a23d 100644
--- a/SecurityPkg/Tcg/TrEESmm/Tpm.asl
+++ b/Core/SecurityPkg/Tcg/TrEESmm/Tpm.asl
diff --git a/SecurityPkg/Tcg/TrEESmm/TrEESmm.c b/Core/SecurityPkg/Tcg/TrEESmm/TrEESmm.c
index 1683dedc8a..1683dedc8a 100644
--- a/SecurityPkg/Tcg/TrEESmm/TrEESmm.c
+++ b/Core/SecurityPkg/Tcg/TrEESmm/TrEESmm.c
diff --git a/SecurityPkg/Tcg/TrEESmm/TrEESmm.h b/Core/SecurityPkg/Tcg/TrEESmm/TrEESmm.h
index a0e1182248..a0e1182248 100644
--- a/SecurityPkg/Tcg/TrEESmm/TrEESmm.h
+++ b/Core/SecurityPkg/Tcg/TrEESmm/TrEESmm.h
diff --git a/SecurityPkg/Tcg/TrEESmm/TrEESmm.inf b/Core/SecurityPkg/Tcg/TrEESmm/TrEESmm.inf
index de71ffdc1b..de71ffdc1b 100644
--- a/SecurityPkg/Tcg/TrEESmm/TrEESmm.inf
+++ b/Core/SecurityPkg/Tcg/TrEESmm/TrEESmm.inf
diff --git a/SecurityPkg/Tcg/TrEESmm/TrEESmm.uni b/Core/SecurityPkg/Tcg/TrEESmm/TrEESmm.uni
index 3123918c3e..3123918c3e 100644
--- a/SecurityPkg/Tcg/TrEESmm/TrEESmm.uni
+++ b/Core/SecurityPkg/Tcg/TrEESmm/TrEESmm.uni
diff --git a/SecurityPkg/Tcg/TrEESmm/TrEESmmExtra.uni b/Core/SecurityPkg/Tcg/TrEESmm/TrEESmmExtra.uni
index c7e4da28c8..c7e4da28c8 100644
--- a/SecurityPkg/Tcg/TrEESmm/TrEESmmExtra.uni
+++ b/Core/SecurityPkg/Tcg/TrEESmm/TrEESmmExtra.uni
diff --git a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.c b/Core/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.c
index b9e89cbfe7..b9e89cbfe7 100644
--- a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.c
+++ b/Core/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.c
diff --git a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.h b/Core/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.h
index 7a51e7d078..7a51e7d078 100644
--- a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.h
+++ b/Core/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.h
diff --git a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.uni b/Core/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.uni
index 749e9a8f17..749e9a8f17 100644
--- a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.uni
+++ b/Core/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.uni
diff --git a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderData.h b/Core/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderData.h
index feeffcc6df..feeffcc6df 100644
--- a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderData.h
+++ b/Core/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderData.h
diff --git a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderDxe.inf b/Core/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderDxe.inf
index 07e6163e8b..07e6163e8b 100644
--- a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderDxe.inf
+++ b/Core/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderDxe.inf
diff --git a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderExtra.uni b/Core/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderExtra.uni
index be332aa681..be332aa681 100644
--- a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderExtra.uni
+++ b/Core/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderExtra.uni
diff --git a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderStrings.uni b/Core/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderStrings.uni
index ca0e5669c0..ca0e5669c0 100644
--- a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderStrings.uni
+++ b/Core/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderStrings.uni
diff --git a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderVfr.Vfr b/Core/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderVfr.Vfr
index 60972203b0..60972203b0 100644
--- a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderVfr.Vfr
+++ b/Core/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderVfr.Vfr
diff --git a/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProvider.c b/Core/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProvider.c
index f623f48304..f623f48304 100644
--- a/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProvider.c
+++ b/Core/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProvider.c
diff --git a/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProvider.h b/Core/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProvider.h
index 83f7f9e2ca..83f7f9e2ca 100644
--- a/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProvider.h
+++ b/Core/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProvider.h
diff --git a/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProvider.uni b/Core/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProvider.uni
index 961e09f360..961e09f360 100644
--- a/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProvider.uni
+++ b/Core/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProvider.uni
diff --git a/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProviderDxe.inf b/Core/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProviderDxe.inf
index 87a66fbea0..87a66fbea0 100644
--- a/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProviderDxe.inf
+++ b/Core/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProviderDxe.inf
diff --git a/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProviderExtra.uni b/Core/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProviderExtra.uni
index 0fc955e477..0fc955e477 100644
--- a/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProviderExtra.uni
+++ b/Core/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProviderExtra.uni
diff --git a/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProviderStrings.uni b/Core/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProviderStrings.uni
index b91fe9ca06..b91fe9ca06 100644
--- a/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProviderStrings.uni
+++ b/Core/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProviderStrings.uni
diff --git a/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/LoadDeferredImage.c b/Core/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/LoadDeferredImage.c
index da1201a5f9..da1201a5f9 100644
--- a/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/LoadDeferredImage.c
+++ b/Core/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/LoadDeferredImage.c
diff --git a/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManager.c b/Core/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManager.c
index a7467b3662..a7467b3662 100644
--- a/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManager.c
+++ b/Core/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManager.c
diff --git a/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManager.h b/Core/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManager.h
index fab0605728..fab0605728 100644
--- a/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManager.h
+++ b/Core/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManager.h
diff --git a/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManager.uni b/Core/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManager.uni
index 82c72baeeb..82c72baeeb 100644
--- a/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManager.uni
+++ b/Core/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManager.uni
diff --git a/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerData.h b/Core/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerData.h
index b08ac46437..b08ac46437 100644
--- a/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerData.h
+++ b/Core/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerData.h
diff --git a/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerDxe.inf b/Core/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerDxe.inf
index ac23818660..ac23818660 100644
--- a/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerDxe.inf
+++ b/Core/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerDxe.inf
diff --git a/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerExtra.uni b/Core/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerExtra.uni
index b0418b6e30..b0418b6e30 100644
--- a/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerExtra.uni
+++ b/Core/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerExtra.uni
diff --git a/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerStrings.uni b/Core/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerStrings.uni
index 8ac0cdfbec..8ac0cdfbec 100644
--- a/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerStrings.uni
+++ b/Core/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerStrings.uni
diff --git a/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerVfr.Vfr b/Core/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerVfr.Vfr
index 306679776d..306679776d 100644
--- a/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerVfr.Vfr
+++ b/Core/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerVfr.Vfr
diff --git a/SecurityPkg/UserIdentification/UserProfileManagerDxe/ModifyAccessPolicy.c b/Core/SecurityPkg/UserIdentification/UserProfileManagerDxe/ModifyAccessPolicy.c
index 5b4171ddec..5b4171ddec 100644
--- a/SecurityPkg/UserIdentification/UserProfileManagerDxe/ModifyAccessPolicy.c
+++ b/Core/SecurityPkg/UserIdentification/UserProfileManagerDxe/ModifyAccessPolicy.c
diff --git a/SecurityPkg/UserIdentification/UserProfileManagerDxe/ModifyIdentityPolicy.c b/Core/SecurityPkg/UserIdentification/UserProfileManagerDxe/ModifyIdentityPolicy.c
index 7c58329591..7c58329591 100644
--- a/SecurityPkg/UserIdentification/UserProfileManagerDxe/ModifyIdentityPolicy.c
+++ b/Core/SecurityPkg/UserIdentification/UserProfileManagerDxe/ModifyIdentityPolicy.c
diff --git a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileAdd.c b/Core/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileAdd.c
index 11233a1509..11233a1509 100644
--- a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileAdd.c
+++ b/Core/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileAdd.c
diff --git a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileDelete.c b/Core/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileDelete.c
index 8be302e1cc..8be302e1cc 100644
--- a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileDelete.c
+++ b/Core/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileDelete.c
diff --git a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManager.c b/Core/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManager.c
index 4bba0824c7..4bba0824c7 100644
--- a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManager.c
+++ b/Core/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManager.c
diff --git a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManager.h b/Core/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManager.h
index 5ab5457a8f..5ab5457a8f 100644
--- a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManager.h
+++ b/Core/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManager.h
diff --git a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManager.uni b/Core/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManager.uni
index e4a768e00a..e4a768e00a 100644
--- a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManager.uni
+++ b/Core/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManager.uni
diff --git a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerData.h b/Core/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerData.h
index 4548c758b5..4548c758b5 100644
--- a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerData.h
+++ b/Core/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerData.h
diff --git a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerDxe.inf b/Core/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerDxe.inf
index 619b2dd9f0..619b2dd9f0 100644
--- a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerDxe.inf
+++ b/Core/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerDxe.inf
diff --git a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerExtra.uni b/Core/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerExtra.uni
index c96bbeca6a..c96bbeca6a 100644
--- a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerExtra.uni
+++ b/Core/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerExtra.uni
diff --git a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerStrings.uni b/Core/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerStrings.uni
index 65f714a5c8..65f714a5c8 100644
--- a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerStrings.uni
+++ b/Core/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerStrings.uni
diff --git a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerVfr.Vfr b/Core/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerVfr.Vfr
index 2cf3359f2a..2cf3359f2a 100644
--- a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerVfr.Vfr
+++ b/Core/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerVfr.Vfr
diff --git a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileModify.c b/Core/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileModify.c
index 833307189a..833307189a 100644
--- a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileModify.c
+++ b/Core/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileModify.c
diff --git a/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/AuthService.c b/Core/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/AuthService.c
index 490a8b3417..490a8b3417 100644
--- a/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/AuthService.c
+++ b/Core/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/AuthService.c
diff --git a/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/AuthService.h b/Core/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/AuthService.h
index f3e15f61e2..f3e15f61e2 100644
--- a/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/AuthService.h
+++ b/Core/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/AuthService.h
diff --git a/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/EsalVariableDxeSal.inf b/Core/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/EsalVariableDxeSal.inf
index 16caa30dad..16caa30dad 100644
--- a/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/EsalVariableDxeSal.inf
+++ b/Core/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/EsalVariableDxeSal.inf
diff --git a/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/EsalVariableDxeSal.uni b/Core/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/EsalVariableDxeSal.uni
index 08588fc10d..08588fc10d 100644
--- a/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/EsalVariableDxeSal.uni
+++ b/Core/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/EsalVariableDxeSal.uni
diff --git a/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/EsalVariableDxeSalExtra.uni b/Core/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/EsalVariableDxeSalExtra.uni
index cb65895210..cb65895210 100644
--- a/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/EsalVariableDxeSalExtra.uni
+++ b/Core/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/EsalVariableDxeSalExtra.uni
diff --git a/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/InitVariable.c b/Core/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/InitVariable.c
index 0f1d645622..0f1d645622 100644
--- a/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/InitVariable.c
+++ b/Core/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/InitVariable.c
diff --git a/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/Reclaim.c b/Core/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/Reclaim.c
index 1cbf9ac877..1cbf9ac877 100644
--- a/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/Reclaim.c
+++ b/Core/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/Reclaim.c
diff --git a/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/Variable.c b/Core/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/Variable.c
index dfa85973f4..dfa85973f4 100644
--- a/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/Variable.c
+++ b/Core/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/Variable.c
diff --git a/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/Variable.h b/Core/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/Variable.h
index b32ef741bf..b32ef741bf 100644
--- a/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/Variable.h
+++ b/Core/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/Variable.h
diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfig.vfr b/Core/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfig.vfr
index bbecff2b08..bbecff2b08 100644
--- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfig.vfr
+++ b/Core/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfig.vfr
diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDevicePath.c b/Core/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDevicePath.c
index 28c4d4f8b6..28c4d4f8b6 100644
--- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDevicePath.c
+++ b/Core/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDevicePath.c
diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDriver.c b/Core/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDriver.c
index 1d6c4ac6e8..1d6c4ac6e8 100644
--- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDriver.c
+++ b/Core/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDriver.c
diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf b/Core/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
index fa7c39d6e5..fa7c39d6e5 100644
--- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
+++ b/Core/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.uni b/Core/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.uni
index d0d2e5ad75..d0d2e5ad75 100644
--- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.uni
+++ b/Core/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.uni
diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxeExtra.uni b/Core/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxeExtra.uni
index 2bc7f3d537..2bc7f3d537 100644
--- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxeExtra.uni
+++ b/Core/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxeExtra.uni
diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigFileExplorer.c b/Core/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigFileExplorer.c
index 1b6f888042..1b6f888042 100644
--- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigFileExplorer.c
+++ b/Core/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigFileExplorer.c
diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c b/Core/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c
index 2eaf24633d..2eaf24633d 100644
--- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c
+++ b/Core/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c
diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.h b/Core/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.h
index 75b18f121c..75b18f121c 100644
--- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.h
+++ b/Core/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.h
diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigMisc.c b/Core/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigMisc.c
index 038707ca83..038707ca83 100644
--- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigMisc.c
+++ b/Core/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigMisc.c
diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigNvData.h b/Core/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigNvData.h
index 6b69f92b26..6b69f92b26 100644
--- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigNvData.h
+++ b/Core/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigNvData.h
diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigStrings.uni b/Core/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigStrings.uni
index 320cc79c47..320cc79c47 100644
--- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigStrings.uni
+++ b/Core/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigStrings.uni