Merge 05ba328 for LLVM update to 316199

Change-Id: I3d0d44187373bffbc48806e1cd5d14ed8233659c