Merge "NetworkStatsFactory: fix double accounting on IPv6 only networks" into oc-dev
am: f37b271894  -s ours

Change-Id: I28f139b2bc5a42eed4caf01bea7a1a9426a91625
tree: 31ee3e899267aa615fefe6b4ad8141a5767d2c03
  1. core/
  2. services/
  3. tests/