Hi Liming and Michael,

I have added the requested change, here is the PR: https://github.com/tianocore/edk2/pull/4546

Thanks,
Abhi