Merge ef858170ac4ee33edebe4afdadaec624325e7aa3 for LLVM update to 344140

Change-Id: Icab25c26d854673454339f2252959d3e8015958b