Patch partially by Danny.

Differential Revision: https://reviews.llvm.org/D23535

llvm-svn: 278875