Merge "Fix handling escaped chars in ssid" into jb-mr1-dev