Merge changes I8cf40452,I003c85ba into udc-mainline-prod

* changes:
  Prioritize alternate charset when de-translating SSIDs
  Prioritize alternate charset for SSID translation