Merge 00d38a06e4 for LLVM update to 353983

Change-Id: I8413b4a1839487444fc6255c61fff89c27303dae