Merge 862483e for LLVM update to 305632