am 0161d229: Merge "Remember wifi country that\'s set before boot" into jb-mr2-dev

* commit '0161d229fdbd8407f5b8b783ffa02b145b0cef8e':
  Remember wifi country that's set before boot