Merge "WifiCountryCode: Add null check" into sc-dev