Merge "Handle ascii encoded SSID" into jb-mr1-dev