Merge "Boot loop when SSID has non UTF-8 character in the name" into mnc-dev