Merge "VpnSettings: the field has been renamed."