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

Change-Id: I91971112870c7a3a2d4786c25125204de7e008f5