Merge 712d476de for LLVM update to 353983

Change-Id: I6635ce126bb89a38fab94e3e332d89ae703cd665