[ONOS-7311] and [ONOS-7197] Update ONOS to support most recent version of BMv2 and PI

Change-Id: Ie69cfe1946f3c9241dc7f59a64bd40005a063931
diff --git a/protocols/p4runtime/proto/BUCK b/protocols/p4runtime/proto/BUCK
index fdb2515..95fe691 100644
--- a/protocols/p4runtime/proto/BUCK
+++ b/protocols/p4runtime/proto/BUCK
@@ -2,10 +2,10 @@
     '//bucklets/grpc.bucklet'
 )
 
-PROTOBUF_VER = '3.0.2'
+PROTOBUF_VER = '3.2.0'
 GRPC_VER = '1.3.0'
 
-PI_COMMIT = 'a8814a8ac40838a9df83fe47a17a025b69026fcf'
+PI_COMMIT = '13d611a9c655938676ebcde2bd5653b461f46ca7'
 PI_BASEURL = 'https://github.com/p4lang/PI.git'
 
 # Wondering which .proto files to build? Check p4runtime's Makefile:
diff --git a/protocols/p4runtime/proto/pom.xml b/protocols/p4runtime/proto/pom.xml
index f1d656f..f07728e 100644
--- a/protocols/p4runtime/proto/pom.xml
+++ b/protocols/p4runtime/proto/pom.xml
@@ -29,7 +29,7 @@
     <description>ONOS P4Runtime Proto</description>
 
     <properties>
-        <protobuf.version>3.0.2</protobuf.version>
+        <protobuf.version>3.2.0</protobuf.version>
         <piCommit>a8814a8ac40838a9df83fe47a17a025b69026fcf</piCommit>
         <piBaseUrl>https://github.com/p4lang/PI.git</piBaseUrl>
     </properties>