Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Victor Gouveia <vc.gouveia@gmail.com>
Reviewed-by: Gao, Liming <liming.gao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15565 6f19259b-4bc3-4df7-8a09-765794883524
Merge branch 'master' of git://github.com/tianocore/edk2