Is it OK to merge the following revision(s) to the 7.0 branch?
https://reviews.llvm.org/rL343669
Merged: r345732