Merge "Add unit tests related to data accounting for VPNs with one underlying...
Merge "Add unit tests related to data accounting for VPNs with one underlying network." am: 289759e0 am: 7baa2328
am: 45879943
Change-Id: I80e3ebb556ac0b6bff5d232b881f7d869cb74f00