Merge change 3017 into donut

* changes:
  Add the EAP related fields for WiFi configuration.