Merge 331ffd31b3d for LLVM update to 349610

Change-Id: I76194b666318b18bfc3e0fbf1fcd3d84fcfd1a4e