Merge 7a5b758 for LLVM update to 349610

Change-Id: I1ba0bbe7b606a2539855c4eb67804d1001bd8b0b