Merge "Fix wrong sample order written by NetworkStatsService"