Merge commit '19cd309f9eccdf8454dc6e5076013588b7a170a3' * commit '19cd309f9eccdf8454dc6e5076013588b7a170a3': Add the EAP related fields for WiFi configuration.
Merge commit '19cd309f9eccdf8454dc6e5076013588b7a170a3' * commit '19cd309f9eccdf8454dc6e5076013588b7a170a3': Add the EAP related fields for WiFi configuration.