Merge "When wifi ssid is empty, return WifiSsid.NONE" into nyc-dev