Merge "Merge NetworkStatsService handler changes." into rvc-dev