Merge "Fix Wi-Fi SSID null handling"