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

Change-Id: I7ce4d1327e4f26080bd1001fb8fa1d370d2bcb96