am bad5d694: Merge "Use a build-specific wifi country code" into klp-dev

* commit 'bad5d694c7d7ae27ca966d6da059f81c5d964748':
  Use a build-specific wifi country code