Merge "Remove dev recorder from NetworkStatsService"