Merge "Add @NonNull annotation to set proxy on VPN parameter."