Merge 80b6bd26 for LLVM update to 353983

Change-Id: I725a25e633fed57b4065f7c34243b468a5ab125c