This is in response to failures seen after landing D138307. Differential Revision: https://reviews.llvm.org/D138596