Merge 1839f48 for LLVM update to 339409

Change-Id: I6c070048b836fef72d3d13531dadebc68a775707