Merge "Handle null SSID cleanly" into jb-dev