Merge "Fix SSID not being logged by the validation logs" into pi-dev