Recommit r250345, it was reverted in r250366 to investigate a bot failure.

Our internal bot is still red after r250366.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@250415 91177308-0d34-0410-b5e6-96231b3b80d8
8 files changed