Merge "Updates for LLVM merge to r176139." into jb-mr2-dev