Please merge the following revisions to the 7.0 branch. The fix was intended for release in 7.0 but missed the deadline. https://reviews.llvm.org/rL340931 https://reviews.llvm.org/rL340932
Merged: r346735 r346736