Merge "Use StatsEvent in Java autogenerated code" am: 94e980f83b am: b2a92d143a

Change-Id: I9c2f4181271d8c766072a1d15d23b5862f6f3228