Merge "Move some NetworkStats tests to tests/net." into oc-dev