Merge "Add unit tests related to data accounting for VPNs with one underlying network." am: 289759e0d2
am: 7baa232824

Change-Id: I7ab73884266bc4b64d1914557a29e84fc4de431e