Merge "Use the real device provider name on the UI" into udc-dev