Merge change 8172 into donut

* changes:
  Add the phase2 field for EAP WiFi configuration.