Merge "Fix supplicant start"