Merge f7d5bd26c for LLVM update to 344140

Change-Id: Ifb065c5cfb9e9a8353c26bbdc3803a444dea62b3