Merge "stats_event_list changes for statsd mainline api"