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

Change-Id: Ia2b1ca862959fb685e6595f41dbfb130cdad6009