Please merge the following revision to the 7.0 branch. This fixes regression introduced in 7.0. https://reviews.llvm.org/rL340927
Merged: r346734