Merge change 6102 into donut

* changes:
  Backup Wifi supplicant data.