Merge 05cb0e14 for LLVM update to 305632