Merge "Use un-translated SSID for DPP" into udc-dev