[automerger skipped] DO NOT MERGE: Add unit tests to ensure VPN meteredness am: 66bc52884b  -s ours
am: 79aad4f39a

Change-Id: Iddfe4fcc6f7eca5ac94955205fb57296d6b029ad