This PR fixes the error described in #26332.
Comment From: pivotal-issuemaster
@mattisonchao Please sign the Contributor License Agreement!
Click here to manually synchronize the status of this Pull Request.
See the FAQ for frequently asked questions.
Comment From: pivotal-issuemaster
@mattisonchao Thank you for signing the Contributor License Agreement!
Comment From: sbrannen
This has been merged into master and polished in bd2edf26dfbba7a0ed3b7f31af004ee071d3feb1.
Thanks