Hi Justin and reviewers,
Could you please help cherry-pick this CL to gerrit-ToT?
Thanks

View Change

To view, visit change 42036. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: coreboot

Gerrit-Branch: master

Gerrit-Change-Id: I99b04fec88da481e21b7a05807a4f1edeb3a5bdf

Gerrit-Change-Number: 42036

Gerrit-PatchSet: 2

Gerrit-Owner: Tony Huang <tony-huang@quanta.corp-partner.google.com>

Gerrit-Reviewer: Henry Sun <henrysun@google.com>

Gerrit-Reviewer: Justin TerAvest <teravest@chromium.org>

Gerrit-Reviewer: Karthik Ramasubramanian <kramasub@google.com>

Gerrit-Reviewer: Marco Chen <marcochen@google.com>

Gerrit-Reviewer: Wisley Chen <wisley.chen@quanta.corp-partner.google.com>

Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>

Gerrit-CC: Paul Menzel <paulepanter@users.sourceforge.net>

Gerrit-Comment-Date: Thu, 04 Jun 2020 00:29:29 +0000

Gerrit-HasComments: No

Gerrit-Has-Labels: No

Gerrit-MessageType: comment