Merge "Add API for proxy configuration over VPN."