Merge fd6579e35 for LLVM update to 344140

Change-Id: I8ee9da9db85c45170dc51297c6268fe81af6ad1d