am 63a8e04d: am d9485403: Merge "Include the VPN server IP address in the VPN...
am 63a8e04d: am d9485403: Merge "Include the VPN server IP address in the VPN state file." into lmp-dev
* commit '63a8e04d':
Include the VPN server IP address in the VPN state file.