Merge "[RDKB: fix 6g ssid not seen by clients]"