Merge "Revert "WifiStateMachine: remove ssid from NetworkInfo"" into pi-dev