Merge "Add unit tests related to data accounting for VPNs with one underlying network." am: 43c87768e0
am: 5df3d62d01

Change-Id: I7ab73884266bc4b64d1914557a29e84fc4de431e
tree: d574d462cbcebd6298161ae15ba6bec32e959902
  1. core/
  2. services/
  3. tests/