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

* commit '66c7bd54046c567de5e3a4d332987a28ecb78092':
  Remember wifi country that's set before boot