am 63dd9d2f: am 4802c6da: am 4d8a8392: Merge "Don\'t set same country code on supplicant again and again" into klp-dev

* commit '63dd9d2f550983d890ea21eee9b8f8619608bb79':
  Don't set same country code on supplicant again and again