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

Change-Id: I2a6b36c74055ec55a1f2dcca082b6c343e352095