Merge commit 'e055d5833afc4124f0686b8d98f0b1adb3dd006f' * commit 'e055d5833afc4124f0686b8d98f0b1adb3dd006f': Save and restore partial supplicant data, not the whole file.
Merge commit 'e055d5833afc4124f0686b8d98f0b1adb3dd006f' * commit 'e055d5833afc4124f0686b8d98f0b1adb3dd006f': Save and restore partial supplicant data, not the whole file.