Thanks Ray for the review.
FYI Sean has also push the github PR here:

https://github.com/tianocore/edk2/pull/3389