Merge "Make some NetworkStats APIs system-current" into tm-dev