am 52bc363c: Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev

* commit '52bc363cf3a7de8431cfbb370f0fd3adeecaed52':
  DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns