Merge "Fix NetworkStatsAccessTest"