Merge "VpnSettings: rename some fields."