Merge "Rename some Vpn fields." am: d1c510f749 am: 4355ad58c6
am: 2e8be0cae3

Change-Id: Ic93d11d2592e9e2084f74a38b0ee6d2197f66958