Merge "Make ToyVpn a little more realistic"
am: 5387f7163d

Change-Id: I5ce97f677253a310048074601f6308d5db6ce1c6