Merge "Add tests for DeviceConfigServiceManager" into udc-dev