Merge "Merge "Move some NetworkStats tests to tests/net." into oc-dev am: 74fe2cbc -s ours am: ea28d269 -s ours"