Merge db53734a for LLVM update to 349610

Change-Id: I995fb378508f04274401472e4213c4f1cd16ed4e