Merge "Sets deviceId in providers" into udc-dev