Merge "Fix NetworkStatsObserversTest"