Merge "Fix NetworkStatsAccessTest"
tree: d3635c6c8f2092c3a82e416c1e0765c64264c226
  1. core/
  2. services/
  3. tests/