EDKII FvbNorFlashStandaloneMm ASSERT hanging system duing UEFI boot

I’m running JetPack 6.1, edk2-nvidia_r36.4.0, on my Orin NX system. I have been continually running into the following ASSERT during boot, causing my NX system to hang and requiring me use the force recovery mode to reflash QSPI to get the system working again.

I/TC: Reserved shared memory is disabled
I/TC: Dynamic shared memory is enabled
I/TC: Normal World virtualization support is disabled
I/TC: Asynchronous notifications are disabled
I/TC: WARNING: Test UEFI variable auth key is being used !
I/TC: WARNING: UEFI variable protection is not fully enabled !

ASSERT [FvbNorFlashStandaloneMm] /out/nvidia/optee_ftpm.t234-uefi/StandaloneMmOptee_RELEASE/edk2-nvidia/Silicon/NVIDIA/Drivers/FvbNorFlashDxe/FvbNorFlashStandaloneMm.c(937): ((BOOLEAN)(0==1))

The Assert seems to occur after adding and removing bootable devices from my system multiples, such as Ethernet card or USB flash drive.

Here is the code and comment from FvbNorFlashStandaloneMm.c about the Assert.

    /* We're here, which means there is a non-erased Variable Integrity space
     * that isn't matching our expected measurement.
     * The default behavior if we fail to validate the integrity of the Variable Store
     * is to assert.
     * But Users can choose to not assert (via the PCD item), if they do, then the driver
     * will corrupt the FV header and set a volatile variable that will signal the NS UEFI
     * to reboot the system. The subsequent reboot should re-initialize the Variable Store.
     */
    if (FeaturePcdGet (PcdAssertOnVarStoreIntegrityCheckFail) == TRUE) {
      ASSERT (FALSE);
    } else {
      Status = gMmst->MmLocateProtocol (&gEfiSmmVariableProtocolGuid, NULL, (VOID **)&SmmVariable);
      if (EFI_ERROR (Status)) {
        DEBUG ((DEBUG_ERROR, "%a: gEfiSmmVariableProtocolGuid: NOT LOCATED!\n", __FUNCTION__));
      }

I’ve tried disabling the Assert by setting PcdAssertOnVarStoreIntegrityCheckFail to FALSE in the following files, but I still keep hitting the ASSERT.

edk2-nvidia_r36.4.0/edk2-nvidia/Platform/NVIDIA/StandaloneMmOptee/StandaloneMmOptee.dsc.inc:54:  gNVIDIATokenSpaceGuid.PcdAssertOnVarStoreIntegrityCheckFail|FALSE
edk2-nvidia_r36.4.0/edk2-nvidia/Silicon/NVIDIA/NVIDIA.dec:515:  gNVIDIATokenSpaceGuid.PcdAssertOnVarStoreIntegrityCheckFail|FALSE|BOOLEAN|0x00000129

Why does setting PcdAssertOnVarStoreIntegrityCheckFail to FALSE not prevent it from encountering the Assert?

What is the proper way to disable this Assert, as mentioned in the FvbNorFlashStandaloneMm.c comments?

please refer to below topic to address UEFI assertion issue.