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

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