Merge 765115422be for LLVM update to 344140

Change-Id: Iec62707cf4e4881b2072b7d396b73468c181a11b