Merge 5077597e0d5 for LLVM update to 353983

Change-Id: Ifad5eec4c06bd25ca33fcd8874563a0651c1dbde