Hi Liming,

Created edk2 Pull Request with Patches, Please help to check.
https://github.com/tianocore/edk2/pull/3214

Thanks,
Sainadh.