Merge "Move type ids to stats_event.h"