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

Change-Id: I948d3f6afe6b01d074e2c1f8f8ea24cdca20991e