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

* commit '4d8a8392f7a452479f228fbe08e43fa4145dda56':
  Don't set same country code on supplicant again and again