Merge changes Ieb7f33bc,I81b56862

* changes:
  Fix the legacy VPN tests that start racoon.
  Make testLegacyLockdownVpn more realistic.
tree: 39ff9197c9f49be037948a3ac93c7fc6ee711e81
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS