Merge "Fix network stats and policy tests." into jb-dev