Richard is this OK to merge to the 3.9 branch: https://reviews.llvm.org/rL275905
Approved for branch.
r287815