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