Merge "Revert "Use a build-specific wifi country code"" into klp-dev