Build fix

application/src/main/java/org/thingsboard/server/controller/DeviceController.java

@@ -126,11 +126,11 @@ public class DeviceController extends BaseController {
 
             checkEntity(device.getId(), device, Resource.DEVICE);
 
-            Device oldDevice;
+            Device oldDevice = null;
             if (!created) {
-                oldDevice = deviceService.findDeviceById(getTenantId(), device.getId());
+                oldDevice = checkDeviceId(device.getId(), Operation.WRITE);
             } else {
-                oldDevice = null;
+                checkEntity(null, device, Resource.DEVICE);
             }
 
             Device savedDevice = checkNotNull(deviceService.saveDeviceWithAccessToken(device, accessToken));

application/src/main/java/org/thingsboard/server/service/rpc/RemoveRpcActorMsg.java

@@ -18,10 +18,10 @@ package org.thingsboard.server.service.rpc;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
-import org.thingsboard.rule.engine.api.msg.ToDeviceActorNotificationMsg;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.msg.MsgType;
+import org.thingsboard.server.common.msg.ToDeviceActorNotificationMsg;
 
 import java.util.UUID;