This is a follow up commit to address post-commit comment in D70443 Differential revision: https://reviews.llvm.org/D70443