Merge 307bb62 for LLVM update to 349610

Change-Id: I171a8d418e753fd4e96a9e58ae14ebf1a20f3979