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

Change-Id: Ia2b1ca862959fb685e6595f41dbfb130cdad6009
tree: e05af2450ba5d9a6d52d5a05017e1b59f05a80c4
  1. core/
  2. services/
  3. tests/