am d9485403: Merge "Include the VPN server IP address in the VPN state file." into lmp-dev

* commit 'd94854030c76fc4ee4126ca1707a76fbd1f29126':
  Include the VPN server IP address in the VPN state file.