Merge "Change visibility of members in StatsEvent"