This mechanically applies the same changes from D121427 everywhere. Differential Revision: https://reviews.llvm.org/D121746