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

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