Merge 171531e317 for LLVM update to 353983

Change-Id: Ia74b4aa849e43a8bf33f944d94d18920454f6a7a