Merge e878418 for LLVM update to 344140

Change-Id: Iad73c26d7b08137c5c5c0c07559aab6ea3fd0c82