Merge 04d1afc9 for LLVM update to 344140

Change-Id: I6f92971ca71107a4853ef42330292f29b632ba1e