am 97b46064: am 3832b13c: am 54cea234: Merge "Boot loop when SSID has non UTF-8 character in the name" into mnc-dev

* commit '97b4606422afc43dcf93d0452325297a2ce70abd':
  Boot loop when SSID has non UTF-8 character in the name