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

* commit '4802c6da7f044e7bd5927601a78713130cf157c0':
  Don't set same country code on supplicant again and again