Merge 6f10573 for LLVM update to 353983

Change-Id: If23612bcc67a98ba4b0328fa26444f522cc8d577