Merge "wifi: improve country code logging"