Bug 824366 - [FTE] hidden Wi-Fi support for first time startup

styling changes

merge conflict

lint fix

fix

fix

fix

lint styles