Merge "Move DeviceConfig check to Service" into udc-dev