Merge "Replace manual creation of StatsEvent objects with their appropriate buildStatsEvent() method"