Merge change 24475 into eclair

* changes:
  Save and restore partial supplicant data, not the whole file.