Merge 47651f32 for LLVM update to 316199

Change-Id: I66c1048d534983bdf966ede3c00cf06a318c6b47