Merge "Revert "mako: disable DFS scan, enable country code from SIM"" into jb-mr2-dev