Merge "Address API review comments for VPN changes."