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