Merged in commit 53defa05701b ("Merge remote-tracking branch 'remotes/lersek/tags/edk2-pull-2019-06-14' into staging", 2019-06-17).
Merged in commit 53defa05701b ("Merge remote-tracking branch 'remotes/ lersek/ tags/edk2- pull-2019- 06-14' into staging", 2019-06-17).