Merge changes I4eaa714c,I85a324d9 into main

* changes:
  Coverage for testLegacyLockdownVpn()
  Create LockdownVpnTrackerTest