Merge "Rename some Vpn fields."
am: d1c510f749

Change-Id: I4aac3d05aa5b879be67f1e3673e1d930e2160cb8