Merge "Add @NonNull annotation to set proxy on VPN parameter."
am: 909baeddfa

Change-Id: I0213524c6b71576bafb46e5b9378c3f43a325888