This re-applies bb939931a1, which had been reverted by 09cebfb978 because it broke Chromium. The issues seen by Chromium should be addressed by 1d0f79558c. Differential Revision: https://reviews.llvm.org/D128927
bb939931a1
09cebfb978
1d0f79558c