diff --git a/lib/BUCK b/lib/BUCK
index 43f0aa8..df51368 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -1,4 +1,4 @@
-# ***** This file was auto-generated at Tue, 30 May 2017 21:23:13 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Wed, 31 May 2017 18:05:22 GMT. Do not edit this file manually. *****
 # ***** Use onos-lib-gen *****
 
 pass_thru_pom(
@@ -121,6 +121,18 @@
   ],
 )
 
+osgi_feature_group(
+  name = 'GRPC_1.3',
+  visibility = ['PUBLIC'],
+  exported_deps = [
+    ':grpc-core-1.3.0',
+    ':grpc-protobuf-1.3.0',
+    ':grpc-stub-1.3.0',
+    ':grpc-netty-1.3.0',
+    ':grpc-auth-1.3.0',
+  ],
+)
+
 remote_jar (
   name = 'aopalliance-repackaged',
   out = 'aopalliance-repackaged-2.5.0-b32.jar',
@@ -1271,3 +1283,66 @@
   visibility = [ 'PUBLIC' ],
 )
 
+remote_jar (
+  name = 'grpc-core-1.3.0',
+  out = 'grpc-core-1.3.0.jar',
+  url = 'mvn:io.grpc:grpc-core:jar:1.3.0',
+  sha1 = 'c44f8c1d9561f5ad0212cb4ee5e035bc03d47700',
+  maven_coords = 'io.grpc:grpc-core:jar:NON-OSGI:1.3.0',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
+  name = 'grpc-protobuf-1.3.0',
+  out = 'grpc-protobuf-1.3.0.jar',
+  url = 'mvn:io.grpc:grpc-protobuf:jar:1.3.0',
+  sha1 = 'ab950b38b67a3b22c8d709970bef053304b13b31',
+  maven_coords = 'io.grpc:grpc-protobuf:jar:NON-OSGI:1.3.0',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
+  name = 'grpc-stub-1.3.0',
+  out = 'grpc-stub-1.3.0.jar',
+  url = 'mvn:io.grpc:grpc-stub:jar:1.3.0',
+  sha1 = 'ec6514126b1e4b460491b29df11a365880359d8c',
+  maven_coords = 'io.grpc:grpc-stub:jar:NON-OSGI:1.3.0',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
+  name = 'grpc-netty-1.3.0',
+  out = 'grpc-netty-1.3.0.jar',
+  url = 'mvn:io.grpc:grpc-netty:jar:1.3.0',
+  sha1 = 'a81c3f104c51302fbb972fdc1957dc5b3091d89a',
+  maven_coords = 'io.grpc:grpc-netty:jar:NON-OSGI:1.3.0',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
+  name = 'grpc-auth-1.3.0',
+  out = 'grpc-auth-1.3.0.jar',
+  url = 'mvn:io.grpc:grpc-auth:jar:1.3.0',
+  sha1 = '11e3062f80979d1c6b3e7b4225c10c5d854ffd90',
+  maven_coords = 'io.grpc:grpc-auth:jar:NON-OSGI:1.3.0',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
+  name = 'protobuf-java-3.3.0',
+  out = 'protobuf-java-3.3.0.jar',
+  url = 'mvn:com.google.protobuf:protobuf-java:jar:3.3.0',
+  sha1 = '9f301d1a27501b1afcb2ed16aad428337dabf9e4',
+  maven_coords = 'com.google.protobuf:protobuf-java:3.3.0',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
+  name = 'protobuf-java-3.2.0',
+  out = 'protobuf-java-3.2.0.jar',
+  url = 'mvn:com.google.protobuf:protobuf-java:jar:3.2.0',
+  sha1 = '62ccf171a106ff6791507f2d5364c275f9a3131d',
+  maven_coords = 'com.google.protobuf:protobuf-java:3.2.0',
+  visibility = [ 'PUBLIC' ],
+)
+
diff --git a/lib/deps.json b/lib/deps.json
index bc384ea..c51ef16 100644
--- a/lib/deps.json
+++ b/lib/deps.json
@@ -87,6 +87,13 @@
       "//core/api:onos-api-tests",
       "//core/common:onos-core-common-tests",
       "//utils/osgi:onlab-osgi-tests"
+    ],
+    "GRPC_1.3": [
+      "grpc-core-1.3.0",
+      "grpc-protobuf-1.3.0",
+      "grpc-stub-1.3.0",
+      "grpc-netty-1.3.0",
+      "grpc-auth-1.3.0"
     ]
   },
 
@@ -225,6 +232,13 @@
       "repo": "https://oss.sonatype.org/content/repositories/snapshots"
     },
     "plexus-utils": "mvn:org.codehaus.plexus:plexus-utils:3.0.24",
-    "sshd-core": "mvn:org.apache.sshd:sshd-core:1.4.0"
+    "sshd-core": "mvn:org.apache.sshd:sshd-core:1.4.0",
+    "grpc-core-1.3.0": "mvn:io.grpc:grpc-core:1.3.0",
+    "grpc-protobuf-1.3.0": "mvn:io.grpc:grpc-protobuf:1.3.0",
+    "grpc-stub-1.3.0": "mvn:io.grpc:grpc-stub:1.3.0",
+    "grpc-netty-1.3.0": "mvn:io.grpc:grpc-netty:1.3.0",
+    "grpc-auth-1.3.0": "mvn:io.grpc:grpc-auth:1.3.0",
+    "protobuf-java-3.3.0": "mvn:com.google.protobuf:protobuf-java:3.3.0",
+    "protobuf-java-3.2.0": "mvn:com.google.protobuf:protobuf-java:3.2.0"
   }
 }