[ONOS-7233] Refactor gRPC device service and translator

Change-Id: I6aadd6cbfc8adaf97258d6f54dc022f5e90aaa9e
diff --git a/incubator/protobuf/services/nb/src/main/proto/net/device/DeviceServiceNb.proto b/incubator/protobuf/services/nb/src/main/proto/net/device/DeviceServiceNb.proto
index 1b1dad5..cdf4d89 100644
--- a/incubator/protobuf/services/nb/src/main/proto/net/device/DeviceServiceNb.proto
+++ b/incubator/protobuf/services/nb/src/main/proto/net/device/DeviceServiceNb.proto
@@ -5,6 +5,7 @@
 
 import "net/DeviceProto.proto";
 import "net/device/DeviceEnumsProto.proto";
+import "net/MastershipRoleProto.proto";
 import "net/device/PortStatisticsProto.proto";
 import "net/PortProto.proto";
 import "net/ConnectPointProto.proto";
@@ -44,7 +45,7 @@
 }
 
 message getRoleReply {
-    .net.device.MastershipRoleProto role = 1;
+    .net.MastershipRoleProto role = 1;
 }
 
 message getPortsRequest {