Merge "Add unit test for NetworkStats iterator"