Merge "wlan: Use XY/7 locale to support HT40" into jb-mr1-dev