diff --git a/vendor/github.com/opencord/voltha-protos/go/voltha/voltha.pb.go b/vendor/github.com/opencord/voltha-protos/go/voltha/voltha.pb.go
index cfd5833..9d1498c 100644
--- a/vendor/github.com/opencord/voltha-protos/go/voltha/voltha.pb.go
+++ b/vendor/github.com/opencord/voltha-protos/go/voltha/voltha.pb.go
@@ -420,6 +420,9 @@
 // OfpMeterFeatures from public import voltha_protos/openflow_13.proto
 type OfpMeterFeatures = openflow_13.OfpMeterFeatures
 
+// OfpMeterEntry from public import voltha_protos/openflow_13.proto
+type OfpMeterEntry = openflow_13.OfpMeterEntry
+
 // OfpExperimenterMultipartHeader from public import voltha_protos/openflow_13.proto
 type OfpExperimenterMultipartHeader = openflow_13.OfpExperimenterMultipartHeader
 
@@ -1964,6 +1967,47 @@
 	return ""
 }
 
+// Additional information required to process flow at device adapters
+type FlowMetadata struct {
+	// Meters associated with flow-update to adapter
+	Meters               []*openflow_13.OfpMeterConfig `protobuf:"bytes,1,rep,name=meters,proto3" json:"meters,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                      `json:"-"`
+	XXX_unrecognized     []byte                        `json:"-"`
+	XXX_sizecache        int32                         `json:"-"`
+}
+
+func (m *FlowMetadata) Reset()         { *m = FlowMetadata{} }
+func (m *FlowMetadata) String() string { return proto.CompactTextString(m) }
+func (*FlowMetadata) ProtoMessage()    {}
+func (*FlowMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_e084f1a60ce7016c, []int{13}
+}
+
+func (m *FlowMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FlowMetadata.Unmarshal(m, b)
+}
+func (m *FlowMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FlowMetadata.Marshal(b, m, deterministic)
+}
+func (m *FlowMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FlowMetadata.Merge(m, src)
+}
+func (m *FlowMetadata) XXX_Size() int {
+	return xxx_messageInfo_FlowMetadata.Size(m)
+}
+func (m *FlowMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_FlowMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_FlowMetadata proto.InternalMessageInfo
+
+func (m *FlowMetadata) GetMeters() []*openflow_13.OfpMeterConfig {
+	if m != nil {
+		return m.Meters
+	}
+	return nil
+}
+
 func init() {
 	proto.RegisterEnum("voltha.AlarmFilterRuleKey_AlarmFilterRuleKey", AlarmFilterRuleKey_AlarmFilterRuleKey_name, AlarmFilterRuleKey_AlarmFilterRuleKey_value)
 	proto.RegisterEnum("voltha.SelfTestResponse_SelfTestResult", SelfTestResponse_SelfTestResult_name, SelfTestResponse_SelfTestResult_value)
@@ -1980,167 +2024,170 @@
 	proto.RegisterType((*SelfTestResponse)(nil), "voltha.SelfTestResponse")
 	proto.RegisterType((*OfAgentSubscriber)(nil), "voltha.OfAgentSubscriber")
 	proto.RegisterType((*Membership)(nil), "voltha.Membership")
+	proto.RegisterType((*FlowMetadata)(nil), "voltha.FlowMetadata")
 }
 
 func init() { proto.RegisterFile("voltha_protos/voltha.proto", fileDescriptor_e084f1a60ce7016c) }
 
 var fileDescriptor_e084f1a60ce7016c = []byte{
-	// 2478 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5a, 0x5b, 0x6f, 0x1b, 0xc7,
-	0x15, 0x16, 0x75, 0xd7, 0x21, 0x29, 0x92, 0x47, 0x17, 0xd3, 0x94, 0x64, 0x4b, 0x13, 0xc7, 0x76,
-	0xe4, 0x88, 0x8c, 0xad, 0xc4, 0x68, 0x9d, 0x06, 0xa9, 0x75, 0xb1, 0xca, 0x5a, 0x16, 0xd9, 0xa5,
-	0x65, 0xb7, 0x4d, 0x0c, 0x62, 0xc9, 0x1d, 0x51, 0x0b, 0x2f, 0xb9, 0xec, 0xce, 0x52, 0xae, 0xe0,
-	0x06, 0x05, 0xd2, 0x2b, 0xfa, 0xd8, 0xfc, 0x85, 0x02, 0x05, 0x8a, 0xfe, 0x15, 0x3f, 0xf5, 0x0f,
-	0x14, 0x45, 0x1f, 0xfa, 0xd8, 0x27, 0xb7, 0x8f, 0xc5, 0x5c, 0x96, 0xdc, 0xe5, 0xee, 0xea, 0x92,
-	0x06, 0xc8, 0x93, 0xb5, 0x73, 0xce, 0x7c, 0xdf, 0x37, 0x67, 0xce, 0x9c, 0x3d, 0x9c, 0x35, 0x14,
-	0x4e, 0x6c, 0xcb, 0x3d, 0xd6, 0xeb, 0x5d, 0xc7, 0x76, 0x6d, 0x56, 0x92, 0x4f, 0x45, 0xf1, 0x84,
-	0x93, 0xf2, 0xa9, 0xb0, 0xdc, 0xb2, 0xed, 0x96, 0x45, 0x4b, 0x7a, 0xd7, 0x2c, 0xe9, 0x9d, 0x8e,
-	0xed, 0xea, 0xae, 0x69, 0x77, 0x98, 0xf4, 0x2a, 0x2c, 0x29, 0xab, 0x78, 0x6a, 0xf4, 0x8e, 0x4a,
-	0xb4, 0xdd, 0x75, 0x4f, 0x95, 0x31, 0x1f, 0x84, 0x6f, 0x53, 0x57, 0x81, 0x17, 0x86, 0x88, 0x9b,
-	0x76, 0xbb, 0x6d, 0x77, 0xa2, 0x6d, 0xc7, 0x54, 0xb7, 0xdc, 0x63, 0x65, 0x23, 0x41, 0x9b, 0x65,
-	0xb7, 0xcc, 0xa6, 0x6e, 0xd5, 0x0d, 0x7a, 0x62, 0x36, 0x69, 0xf4, 0xfc, 0x80, 0x6d, 0x29, 0x68,
-	0xd3, 0x0d, 0xbd, 0xeb, 0x52, 0x47, 0x19, 0xaf, 0x07, 0x8d, 0x76, 0x97, 0x76, 0x8e, 0x2c, 0xfb,
-	0x55, 0xfd, 0xee, 0x66, 0x8c, 0x43, 0xbb, 0x69, 0xd6, 0xdb, 0x66, 0xa3, 0x6e, 0x34, 0x94, 0xc3,
-	0x5a, 0x84, 0x83, 0x6e, 0xe9, 0x4e, 0x7b, 0xe0, 0xb2, 0x1a, 0x74, 0x39, 0xd5, 0x3b, 0xad, 0xba,
-	0xdd, 0xf5, 0x85, 0x94, 0xfc, 0x29, 0x01, 0xc9, 0x1d, 0x21, 0x7a, 0xcf, 0xb1, 0x7b, 0x5d, 0x5c,
-	0x80, 0x51, 0xd3, 0xc8, 0x27, 0x56, 0x13, 0xb7, 0x67, 0xb6, 0x26, 0xfe, 0xf5, 0xf6, 0xcd, 0x4a,
-	0x42, 0x1b, 0x35, 0x0d, 0x2c, 0x43, 0x26, 0xb8, 0x7c, 0x96, 0x1f, 0x5d, 0x1d, 0xbb, 0x9d, 0xbc,
-	0xb7, 0x50, 0x54, 0xfb, 0xb8, 0x2f, 0xcd, 0x12, 0x6b, 0x6b, 0xe6, 0x1f, 0x6f, 0xdf, 0xac, 0x8c,
-	0x73, 0x2c, 0x6d, 0xd6, 0xf2, 0x5b, 0x18, 0x6e, 0xc2, 0x94, 0x07, 0x31, 0x26, 0x20, 0x66, 0x3d,
-	0x88, 0xf0, 0x5c, 0xcf, 0x93, 0x7c, 0x17, 0x52, 0x3e, 0x95, 0x0c, 0xdf, 0x83, 0x09, 0xd3, 0xa5,
-	0x6d, 0x96, 0x4f, 0x08, 0x88, 0xb9, 0x20, 0x84, 0x70, 0xd2, 0xa4, 0x07, 0xf9, 0x25, 0xe0, 0x43,
-	0x1e, 0x95, 0x47, 0xa6, 0xe5, 0x52, 0x47, 0xeb, 0x59, 0xf4, 0x31, 0x3d, 0x25, 0x8d, 0xa8, 0x51,
-	0x9c, 0xe4, 0xac, 0xd9, 0x11, 0x9c, 0x86, 0x71, 0xf7, 0xb4, 0x4b, 0xb3, 0x09, 0x4c, 0xc1, 0x34,
-	0xa3, 0x27, 0xd4, 0x31, 0xdd, 0xd3, 0xec, 0x28, 0x66, 0x20, 0xe9, 0x50, 0x66, 0xf7, 0x9c, 0x26,
-	0xad, 0x9b, 0x46, 0x76, 0x8c, 0x9b, 0x9b, 0xba, 0x4b, 0x5b, 0xb6, 0x73, 0x9a, 0x1d, 0xc7, 0x34,
-	0xcc, 0x48, 0xc1, 0xdc, 0x38, 0xf1, 0x60, 0xe2, 0xdf, 0x6f, 0xdf, 0xac, 0x8c, 0x90, 0x63, 0xc8,
-	0x0c, 0x51, 0xe1, 0xa7, 0x30, 0xf6, 0x92, 0x9e, 0x8a, 0x30, 0xcf, 0xde, 0xdb, 0xf0, 0xc4, 0x87,
-	0x05, 0x45, 0x0c, 0x69, 0x7c, 0x26, 0xce, 0xc3, 0xc4, 0x89, 0x6e, 0xf5, 0x68, 0x7e, 0x94, 0xef,
-	0x94, 0x26, 0x1f, 0x48, 0x0d, 0x92, 0xbe, 0x09, 0x71, 0x7b, 0xb9, 0x01, 0x13, 0x4e, 0xcf, 0xea,
-	0xef, 0xe0, 0x95, 0x18, 0x7a, 0x4d, 0x7a, 0x91, 0x4f, 0x20, 0xe5, 0xb3, 0x30, 0xdc, 0x80, 0xa9,
-	0x23, 0xf9, 0xe7, 0x70, 0xf0, 0xfd, 0x00, 0x9e, 0x0f, 0x79, 0x01, 0x53, 0xfb, 0x76, 0xab, 0x65,
-	0x76, 0x5a, 0x58, 0x82, 0x09, 0x8b, 0x9e, 0x50, 0x4b, 0xad, 0xfb, 0x6a, 0x51, 0x9d, 0xc4, 0x7d,
-	0xbb, 0xb5, 0xcf, 0xc7, 0xfb, 0x7f, 0x68, 0xd2, 0x0f, 0xd7, 0x20, 0xd5, 0xd5, 0x9b, 0x2f, 0xf5,
-	0x16, 0xad, 0x77, 0xf4, 0xb6, 0xb7, 0xd8, 0xa4, 0x1a, 0x3b, 0xd0, 0xdb, 0x94, 0x38, 0x90, 0xda,
-	0xb6, 0x1d, 0x5a, 0xee, 0x30, 0x57, 0xef, 0x34, 0x29, 0xde, 0x84, 0xa4, 0xa9, 0xfe, 0xae, 0x0f,
-	0x2f, 0x1e, 0x3c, 0x4b, 0xd9, 0xc0, 0x4d, 0x98, 0x94, 0x67, 0x5d, 0x80, 0x26, 0xef, 0xcd, 0x7b,
-	0x8b, 0xf8, 0x81, 0x18, 0xad, 0xb9, 0xba, 0xdb, 0x63, 0x5b, 0x13, 0x3c, 0x15, 0x47, 0x34, 0xe5,
-	0xfa, 0x60, 0xe2, 0xbf, 0x1c, 0x87, 0x6c, 0x41, 0xda, 0xcf, 0xc9, 0x70, 0x3d, 0x98, 0x8d, 0x7d,
-	0x2c, 0xbf, 0x97, 0x4a, 0x47, 0x0f, 0xe3, 0xef, 0xe3, 0x30, 0xf9, 0x4c, 0x78, 0xe1, 0x75, 0x98,
-	0x3a, 0xa1, 0x0e, 0x33, 0xed, 0x4e, 0x50, 0xae, 0x37, 0x8a, 0xf7, 0x61, 0x5a, 0xd5, 0x0e, 0x6f,
-	0xcf, 0x32, 0xfd, 0x90, 0xcb, 0x71, 0xff, 0x99, 0xe9, 0xfb, 0x46, 0x1d, 0xda, 0xb1, 0xff, 0xff,
-	0xd0, 0x8e, 0x5f, 0xf4, 0xd0, 0xe2, 0xf7, 0x21, 0xa5, 0x8e, 0x03, 0x3f, 0x4c, 0x2c, 0x3f, 0x21,
-	0x66, 0x62, 0x70, 0xe6, 0xd3, 0xd3, 0x6e, 0x60, 0x76, 0xd2, 0xe8, 0x0f, 0x33, 0xdc, 0x86, 0xb4,
-	0x42, 0x68, 0x89, 0x73, 0x9f, 0x9f, 0x8c, 0x3d, 0xee, 0x7e, 0x0c, 0x45, 0xab, 0x6a, 0xc5, 0x36,
-	0xa4, 0x65, 0x59, 0xf4, 0xd2, 0x76, 0x2a, 0x36, 0x6d, 0x03, 0x20, 0xba, 0x3f, 0xeb, 0x7f, 0x04,
-	0xb9, 0x41, 0x05, 0xd6, 0x5d, 0xbd, 0xa1, 0x33, 0x9a, 0x5f, 0x56, 0x40, 0xdc, 0x52, 0x7c, 0x62,
-	0x36, 0xa4, 0x9c, 0x1d, 0xdd, 0xd5, 0xb7, 0xb2, 0x1c, 0x28, 0xe9, 0xab, 0x07, 0x5a, 0x86, 0x7b,
-	0x71, 0x27, 0x35, 0x1b, 0x9f, 0xc3, 0x9c, 0xbf, 0x66, 0x7b, 0xa0, 0x2b, 0x6a, 0x8b, 0x04, 0xa8,
-	0xd0, 0x76, 0x26, 0xac, 0x90, 0x25, 0xdd, 0x14, 0x82, 0x97, 0x62, 0x7f, 0x4d, 0x40, 0xb6, 0x46,
-	0xad, 0xa3, 0xa7, 0x94, 0xb9, 0x1a, 0x65, 0x5d, 0xbb, 0xc3, 0x78, 0xe5, 0x99, 0x74, 0x28, 0xeb,
-	0x59, 0xae, 0x3a, 0x84, 0xb7, 0xbc, 0x28, 0x0c, 0x7b, 0xfa, 0x07, 0x7a, 0x96, 0xab, 0xa9, 0x69,
-	0xa4, 0x0a, 0xb3, 0x41, 0x0b, 0x26, 0x61, 0xaa, 0x76, 0xb8, 0xbd, 0xbd, 0x5b, 0xab, 0x65, 0x47,
-	0xf8, 0xc3, 0xa3, 0x87, 0xe5, 0xfd, 0x43, 0x6d, 0x37, 0x9b, 0xc0, 0x1c, 0xa4, 0x0f, 0x2a, 0x4f,
-	0xeb, 0xb5, 0xc3, 0x6a, 0xb5, 0xa2, 0x3d, 0xdd, 0xdd, 0xc9, 0x8e, 0xf2, 0xa1, 0xc3, 0x83, 0xc7,
-	0x07, 0x95, 0xe7, 0x07, 0xf5, 0x5d, 0x4d, 0xab, 0x68, 0xd9, 0x31, 0xaf, 0x4c, 0x56, 0x20, 0x57,
-	0x39, 0x7a, 0xd8, 0xa2, 0x1d, 0xb7, 0xd6, 0x6b, 0xb0, 0xa6, 0x63, 0x36, 0xa8, 0x83, 0x2b, 0x00,
-	0xf6, 0x91, 0xce, 0x07, 0xfb, 0xa7, 0x59, 0x9b, 0x51, 0x23, 0x65, 0x03, 0x97, 0x60, 0x46, 0xbd,
-	0xe1, 0x4c, 0x43, 0x55, 0x87, 0x69, 0x39, 0x50, 0x36, 0xc8, 0xc7, 0x00, 0x4f, 0x68, 0xbb, 0x41,
-	0x1d, 0x76, 0x6c, 0x76, 0x39, 0x92, 0xc8, 0x21, 0x59, 0x49, 0x14, 0x92, 0x18, 0xe1, 0x75, 0x04,
-	0x67, 0x45, 0xad, 0x94, 0x10, 0xa3, 0xa6, 0x71, 0xef, 0xcf, 0x25, 0x48, 0xcb, 0xf3, 0x59, 0xa3,
-	0x0e, 0x8f, 0x35, 0x56, 0x60, 0xf6, 0xb0, 0x6b, 0xe8, 0x2e, 0xf5, 0xaa, 0x14, 0x66, 0x7c, 0xc7,
-	0x88, 0x17, 0xb8, 0xc2, 0x62, 0x51, 0x36, 0x28, 0x45, 0xaf, 0x41, 0x29, 0xee, 0xf2, 0x06, 0x85,
-	0xcc, 0x7f, 0xf9, 0xb7, 0x7f, 0x7e, 0x35, 0x3a, 0x8b, 0x29, 0xd1, 0xd7, 0x9c, 0xdc, 0xe5, 0xad,
-	0x04, 0xc3, 0xe7, 0x90, 0xde, 0xa3, 0xae, 0x4f, 0x62, 0xcc, 0xf4, 0x42, 0xff, 0xc4, 0x0c, 0x7c,
-	0x49, 0x41, 0x40, 0xce, 0x23, 0x7a, 0x90, 0xed, 0x01, 0xce, 0x0b, 0xc8, 0x4a, 0xa5, 0x3e, 0xec,
-	0x08, 0x8c, 0x58, 0xb9, 0x2b, 0x02, 0xfb, 0x0a, 0x89, 0xc0, 0x7e, 0x90, 0x58, 0xc7, 0x1d, 0x98,
-	0xd9, 0xa3, 0xae, 0x2a, 0x5e, 0x71, 0x9a, 0xfb, 0xf5, 0x41, 0xfa, 0x91, 0x8c, 0xc0, 0x9c, 0xc1,
-	0x29, 0x85, 0x89, 0x3d, 0xc8, 0xed, 0x9b, 0xcc, 0x0d, 0x16, 0xd2, 0x38, 0xb4, 0x85, 0xa8, 0x8a,
-	0xca, 0xc8, 0xdd, 0x3f, 0xfc, 0xe7, 0xcd, 0xca, 0x94, 0x2a, 0xbe, 0xe2, 0x6f, 0x94, 0x7f, 0x0b,
-	0xb2, 0x39, 0xcc, 0x79, 0x0b, 0x30, 0xfb, 0x0c, 0x35, 0xc8, 0xec, 0xd1, 0x00, 0x2b, 0x82, 0xf7,
-	0x1e, 0x2a, 0xef, 0x14, 0x22, 0x4b, 0x37, 0xb9, 0x26, 0xf0, 0xf2, 0xb8, 0x18, 0xc2, 0x2b, 0xbd,
-	0x36, 0x8d, 0x2f, 0x50, 0x87, 0x14, 0x5f, 0xcb, 0x43, 0xaf, 0xf0, 0xc6, 0x2d, 0x23, 0x3b, 0x54,
-	0xb6, 0x19, 0xb9, 0xc5, 0x55, 0xc3, 0xa0, 0xbe, 0x0b, 0x22, 0xc4, 0xac, 0x47, 0xd4, 0xaf, 0xe5,
-	0xaf, 0x01, 0x39, 0xc5, 0x7e, 0xb0, 0x2c, 0xc7, 0x11, 0x2d, 0x46, 0x16, 0x78, 0x46, 0x3e, 0xe2,
-	0x74, 0xb9, 0xd0, 0x6b, 0x41, 0xb0, 0x5e, 0xc5, 0x2b, 0xbe, 0xf4, 0xf4, 0x9b, 0xf1, 0x33, 0xc8,
-	0xee, 0xd1, 0x20, 0x77, 0x20, 0x6a, 0xd1, 0xef, 0x13, 0x72, 0x43, 0xe0, 0x5e, 0xc3, 0xe5, 0x18,
-	0x5c, 0x19, 0x3c, 0x07, 0x16, 0x43, 0x2b, 0xab, 0xda, 0x8e, 0xcb, 0xa2, 0x37, 0x46, 0xf9, 0x09,
-	0x0f, 0x72, 0x5f, 0x25, 0x40, 0x97, 0x3f, 0x09, 0xb6, 0x1b, 0x48, 0xce, 0x62, 0x2b, 0x09, 0x4f,
-	0xfc, 0x55, 0x02, 0xe6, 0x87, 0x57, 0xc4, 0x11, 0x71, 0x21, 0x82, 0xa6, 0x6c, 0x14, 0xe6, 0x22,
-	0x86, 0xc9, 0xa7, 0x9c, 0x7c, 0x12, 0xc6, 0x39, 0xa4, 0xe0, 0x2e, 0xe2, 0xfb, 0xe7, 0x73, 0x97,
-	0x5e, 0xf3, 0x7f, 0xea, 0x7c, 0xe5, 0xbf, 0x49, 0xc0, 0x95, 0xdd, 0x8e, 0xde, 0xb0, 0xe8, 0x85,
-	0x85, 0xc4, 0x1d, 0xd9, 0x8f, 0x85, 0x80, 0x8f, 0xc8, 0xe6, 0x65, 0x04, 0x94, 0xa8, 0x20, 0xc7,
-	0xdf, 0x25, 0x20, 0xbf, 0x63, 0xb2, 0x6f, 0x44, 0xc8, 0xf7, 0x84, 0x90, 0xfb, 0xe4, 0xc3, 0x4b,
-	0x09, 0x31, 0x24, 0x3b, 0xfe, 0x22, 0x22, 0x17, 0x1e, 0x59, 0xf6, 0xab, 0x60, 0x2e, 0x60, 0xd1,
-	0xff, 0x6b, 0x49, 0xd8, 0xc9, 0x96, 0xca, 0x04, 0x3e, 0x1a, 0x2e, 0x05, 0xe7, 0x65, 0x85, 0x98,
-	0xc5, 0xb3, 0x62, 0xb9, 0x5f, 0xe2, 0x83, 0x02, 0x9e, 0x0a, 0x79, 0xcb, 0x21, 0x62, 0x31, 0x2e,
-	0xe7, 0xc4, 0x86, 0x64, 0x43, 0x48, 0xb8, 0x45, 0x2e, 0x20, 0x81, 0x97, 0xd7, 0x5f, 0x27, 0x60,
-	0x25, 0x42, 0xc5, 0x13, 0xea, 0x52, 0x47, 0xca, 0x58, 0x0a, 0xc8, 0x10, 0x86, 0x27, 0xb6, 0x71,
-	0x8e, 0x8a, 0xa2, 0x50, 0x71, 0x9b, 0xbc, 0x73, 0xa6, 0x8a, 0x36, 0x07, 0x13, 0x32, 0x5e, 0xc3,
-	0xb2, 0x78, 0x3b, 0xb9, 0xd4, 0xe1, 0xcd, 0x30, 0xab, 0x1c, 0xc5, 0x9f, 0xff, 0xe5, 0xb0, 0x20,
-	0x31, 0x47, 0xa3, 0x5d, 0xeb, 0x94, 0xdc, 0x15, 0xcc, 0x77, 0xf0, 0xbd, 0x0b, 0x30, 0xd7, 0x19,
-	0x9f, 0x87, 0x7f, 0x4c, 0xc0, 0x52, 0x64, 0x22, 0xa8, 0x96, 0xce, 0x4f, 0x7e, 0x25, 0xb4, 0x29,
-	0xd2, 0x89, 0x1c, 0xf0, 0x34, 0x48, 0x43, 0x52, 0x98, 0x64, 0xff, 0x18, 0x4a, 0x8c, 0x75, 0xbc,
-	0x7d, 0xee, 0xae, 0xa8, 0xb9, 0xf8, 0x55, 0x02, 0xd6, 0x62, 0xd2, 0x43, 0x30, 0xca, 0xcd, 0x59,
-	0x8b, 0x96, 0x73, 0x91, 0x44, 0xd9, 0x14, 0x92, 0x36, 0xc8, 0x85, 0x25, 0xf1, 0x7d, 0x7a, 0x01,
-	0x49, 0x1e, 0xa9, 0xf3, 0xde, 0x08, 0x99, 0x60, 0xcb, 0xcc, 0xc8, 0xbb, 0x3c, 0x16, 0x33, 0xfd,
-	0xb6, 0x5e, 0x50, 0xe7, 0x30, 0xe3, 0x51, 0x7b, 0xa5, 0xdf, 0x80, 0xf4, 0x00, 0xbe, 0x6c, 0xc4,
-	0x13, 0x24, 0x07, 0x5b, 0xc2, 0x48, 0x91, 0x83, 0x8b, 0x36, 0xfa, 0xac, 0xb7, 0xb2, 0xe4, 0x30,
-	0x0d, 0x86, 0x87, 0x90, 0xd5, 0x68, 0xd3, 0xee, 0x34, 0x4d, 0x8b, 0x7a, 0x2b, 0xf1, 0x03, 0xc6,
-	0x86, 0x6c, 0x59, 0x60, 0x2e, 0x92, 0x30, 0x26, 0x8f, 0xcd, 0xae, 0xe8, 0x54, 0x22, 0x12, 0x76,
-	0xe8, 0xd7, 0x8b, 0x07, 0x83, 0xf3, 0x43, 0xcb, 0x97, 0x6f, 0xa8, 0x1f, 0x42, 0x6a, 0xdb, 0xa1,
-	0xba, 0xab, 0xa4, 0xe1, 0xd0, 0xec, 0x10, 0x9a, 0xea, 0xcd, 0xc8, 0x70, 0x30, 0xb9, 0xa4, 0xe7,
-	0x90, 0x92, 0x25, 0x3f, 0x42, 0x55, 0xdc, 0x22, 0xdf, 0x11, 0x78, 0x2b, 0x64, 0x29, 0x4a, 0x9d,
-	0x57, 0xc4, 0x7f, 0x02, 0x69, 0x55, 0xc3, 0x2f, 0x81, 0xac, 0xde, 0xd0, 0x64, 0x39, 0x12, 0xd9,
-	0xab, 0xca, 0xcf, 0x21, 0xa5, 0xd1, 0x86, 0x6d, 0xbb, 0xdf, 0x98, 0x66, 0x47, 0xc0, 0x71, 0xe0,
-	0x1d, 0x6a, 0x51, 0xf7, 0x6b, 0x04, 0x63, 0x3d, 0x1a, 0xd8, 0x10, 0x70, 0xd8, 0x83, 0xf4, 0x8e,
-	0xfd, 0xaa, 0x63, 0xd9, 0xba, 0x51, 0x6e, 0xeb, 0x2d, 0x3a, 0x78, 0x8b, 0x89, 0x47, 0xcf, 0x56,
-	0x58, 0xf0, 0x08, 0x2b, 0x5d, 0xea, 0x88, 0xab, 0x46, 0xfe, 0xf3, 0x87, 0xdc, 0x17, 0x1c, 0x1f,
-	0x90, 0x3b, 0x91, 0x1c, 0x26, 0x87, 0xa8, 0x1b, 0x0a, 0x83, 0x95, 0x5e, 0xf3, 0x5f, 0x14, 0x5f,
-	0xf0, 0xcd, 0xfd, 0x32, 0x01, 0x8b, 0x7b, 0xd4, 0x0d, 0x70, 0xc8, 0x9b, 0x84, 0x78, 0x01, 0x51,
-	0xc3, 0xe4, 0x81, 0x10, 0xf0, 0x21, 0xde, 0xbb, 0x84, 0x80, 0x12, 0x93, 0x4c, 0x3d, 0xd1, 0xac,
-	0x05, 0xf0, 0x2e, 0xc9, 0xae, 0xea, 0x10, 0x5e, 0x66, 0xf9, 0x78, 0x24, 0x1b, 0xd4, 0x00, 0x12,
-	0x1b, 0xda, 0xd1, 0x28, 0x36, 0x46, 0xde, 0x17, 0x74, 0x37, 0xf1, 0xc6, 0x45, 0xe8, 0xf0, 0xe7,
-	0x30, 0xb7, 0xcd, 0x5b, 0x6f, 0xeb, 0x82, 0x2b, 0x8c, 0xdc, 0x60, 0xb5, 0xc2, 0xf5, 0x4b, 0xad,
-	0xf0, 0xf7, 0x09, 0x98, 0x7b, 0xd8, 0x74, 0xcd, 0x13, 0xdd, 0xa5, 0x82, 0x45, 0x96, 0xf3, 0x4b,
-	0x52, 0x6f, 0x0b, 0xea, 0x4f, 0xc8, 0x77, 0x2e, 0xb3, 0xb5, 0x72, 0xb8, 0x27, 0xf8, 0x78, 0xa2,
-	0xfd, 0x36, 0x01, 0x39, 0x8d, 0x9e, 0x50, 0xc7, 0xfd, 0x56, 0x84, 0x38, 0x82, 0x9a, 0x0b, 0xf9,
-	0x1c, 0x32, 0x83, 0xd7, 0x43, 0xb8, 0x6b, 0x4f, 0x7b, 0x8a, 0x64, 0xbb, 0x5e, 0x0c, 0xb5, 0xeb,
-	0xcb, 0x58, 0x88, 0xa4, 0x97, 0x6d, 0xfa, 0x0b, 0x98, 0xf3, 0xa1, 0xb7, 0xb7, 0xed, 0xce, 0x91,
-	0xd9, 0x0a, 0x32, 0xe4, 0xfa, 0x0c, 0x9e, 0x99, 0xdc, 0x12, 0xc8, 0x6b, 0x78, 0x3d, 0x1a, 0xb9,
-	0x5d, 0x6f, 0x2a, 0x9c, 0x0e, 0x2c, 0xc8, 0xc8, 0x0d, 0x13, 0x84, 0x41, 0x63, 0xcb, 0xd1, 0xba,
-	0xec, 0x2f, 0xc9, 0x79, 0x64, 0x3c, 0x58, 0x6d, 0x7f, 0xb0, 0x2e, 0xd6, 0xd6, 0x3e, 0x38, 0xb3,
-	0xad, 0x8d, 0x8b, 0x5e, 0xbf, 0x9d, 0x9d, 0x0f, 0xf2, 0x5d, 0xa6, 0x7b, 0x7a, 0x74, 0x81, 0xee,
-	0x89, 0xe0, 0x6a, 0x2c, 0xbf, 0xd7, 0x35, 0xd9, 0xfe, 0x45, 0xcb, 0x5b, 0xbd, 0xb8, 0x16, 0x62,
-	0x2e, 0x7c, 0x33, 0xc8, 0x48, 0x89, 0xb3, 0xce, 0x06, 0x6f, 0x12, 0xa3, 0xdf, 0xd6, 0xd2, 0x86,
-	0x9a, 0xb8, 0x56, 0x19, 0x40, 0x0c, 0xc5, 0x38, 0x44, 0x41, 0xd6, 0x04, 0xdc, 0x12, 0x5e, 0x8d,
-	0x82, 0x93, 0x1d, 0x00, 0x83, 0xec, 0x60, 0x11, 0x2a, 0x8a, 0x71, 0xab, 0x98, 0x8f, 0xb8, 0x9c,
-	0x54, 0x57, 0x15, 0x99, 0xa1, 0xeb, 0x4c, 0x79, 0xcf, 0x82, 0x0b, 0x43, 0xc4, 0x2a, 0x72, 0x8f,
-	0x20, 0x5b, 0x73, 0x1d, 0xaa, 0xb7, 0xab, 0x7a, 0xf3, 0x25, 0x75, 0x59, 0xa5, 0xe7, 0xe2, 0x62,
-	0x60, 0xbb, 0xa4, 0xa1, 0xd2, 0x73, 0x63, 0xd3, 0x73, 0xe4, 0x76, 0x02, 0x77, 0x45, 0x73, 0x45,
-	0xcd, 0x13, 0xaa, 0x80, 0xca, 0x9d, 0x33, 0x2e, 0x5a, 0xc2, 0xf8, 0xe5, 0x0e, 0x19, 0xf9, 0x20,
-	0x81, 0x8f, 0x61, 0x4e, 0xc1, 0x6c, 0x1f, 0xeb, 0x9d, 0x16, 0xdd, 0x3d, 0xa1, 0x1d, 0x37, 0x3e,
-	0x0c, 0xf9, 0x00, 0x92, 0x6f, 0x8a, 0x00, 0x3b, 0x84, 0xd9, 0xfe, 0x26, 0xc9, 0x0f, 0x4f, 0xfe,
-	0x5d, 0x8a, 0xba, 0xdf, 0x25, 0x24, 0x3a, 0xe5, 0x55, 0xb4, 0xe4, 0x3e, 0xd5, 0x21, 0x27, 0x3b,
-	0x35, 0xff, 0x67, 0x90, 0xa8, 0x8b, 0xde, 0x42, 0xd4, 0x20, 0x59, 0x15, 0x14, 0x05, 0xd2, 0xdf,
-	0x90, 0xc0, 0xbd, 0x31, 0x3f, 0xc2, 0x52, 0xb7, 0x1f, 0x3d, 0x52, 0xb7, 0x1f, 0x34, 0xa4, 0x3b,
-	0x00, 0x2a, 0x75, 0x1b, 0x90, 0x93, 0x95, 0xe8, 0xeb, 0xe9, 0x7e, 0x57, 0x50, 0x5c, 0x2f, 0x9c,
-	0x41, 0xc1, 0xc5, 0x7f, 0x06, 0x39, 0xd9, 0x6e, 0xc5, 0xe9, 0x8f, 0xcb, 0x22, 0xb5, 0x84, 0xf5,
-	0xb3, 0x96, 0x50, 0x97, 0x47, 0x24, 0xf0, 0xa9, 0xe8, 0xdc, 0x23, 0xe2, 0xf7, 0xf6, 0xae, 0x1d,
-	0x31, 0x3a, 0xfa, 0xb8, 0x2f, 0x9a, 0x79, 0xf1, 0x6a, 0x63, 0xd1, 0xcd, 0xbc, 0xb4, 0x79, 0x1d,
-	0x22, 0x2e, 0xc5, 0xbf, 0xd8, 0x18, 0xfe, 0x18, 0xa6, 0xbd, 0x6b, 0xec, 0x00, 0x58, 0x3e, 0xee,
-	0x3e, 0x9c, 0xdc, 0x14, 0xb0, 0xab, 0xe4, 0x5a, 0x24, 0x2c, 0xa3, 0xd6, 0x51, 0xdd, 0xe5, 0x68,
-	0xcf, 0x44, 0xff, 0x15, 0xf8, 0x1a, 0x30, 0x94, 0x24, 0xe1, 0xcf, 0x05, 0xe1, 0x1a, 0xc4, 0x0f,
-	0x0f, 0xf7, 0x53, 0x3f, 0x8e, 0xcd, 0x06, 0x7e, 0x0e, 0xe8, 0xa5, 0x5e, 0x0c, 0x72, 0xf4, 0x37,
-	0x83, 0x70, 0x3c, 0x82, 0xd8, 0x22, 0xca, 0xc8, 0x20, 0x5d, 0x33, 0xdb, 0x3d, 0xcb, 0xcb, 0x41,
-	0x5c, 0xee, 0x07, 0xc2, 0x3f, 0xac, 0xd1, 0x9f, 0xf5, 0x28, 0x73, 0xe3, 0x7a, 0x8a, 0xd0, 0x55,
-	0x47, 0x30, 0x46, 0x0a, 0xa9, 0xce, 0x91, 0x78, 0x42, 0x6e, 0xc3, 0x4c, 0xff, 0xae, 0x1f, 0xaf,
-	0x7a, 0x84, 0xa1, 0xaf, 0x00, 0x85, 0x78, 0x13, 0x19, 0xd9, 0x32, 0x61, 0xce, 0x76, 0x5a, 0xa2,
-	0xda, 0x34, 0x6d, 0xc7, 0x50, 0xae, 0x5b, 0x29, 0x79, 0xf1, 0x5c, 0x15, 0x5f, 0xbe, 0x7f, 0x7a,
-	0xa7, 0x65, 0xba, 0xc7, 0xbd, 0x06, 0x57, 0x5d, 0xf2, 0x3c, 0xd5, 0xff, 0x40, 0xd8, 0x50, 0x1f,
-	0xc7, 0x5b, 0xb6, 0x1a, 0xf8, 0xcb, 0xe8, 0x62, 0xc5, 0x03, 0x7b, 0xe6, 0xbf, 0xc4, 0xae, 0x8e,
-	0x56, 0xc7, 0xaa, 0xe3, 0xd5, 0x89, 0xea, 0x64, 0x75, 0xaa, 0x3a, 0xdd, 0x98, 0x14, 0x13, 0x37,
-	0xff, 0x17, 0x00, 0x00, 0xff, 0xff, 0xaa, 0x83, 0xb9, 0x38, 0xd8, 0x20, 0x00, 0x00,
+	// 2505 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5a, 0x5b, 0x73, 0xdb, 0xc6,
+	0xf5, 0x17, 0x75, 0xd7, 0x21, 0x29, 0x92, 0x47, 0x37, 0x9a, 0x92, 0x62, 0x69, 0x13, 0x5f, 0xfe,
+	0x4a, 0x44, 0xc6, 0x56, 0xec, 0xf9, 0xd7, 0x69, 0x26, 0xb5, 0x2e, 0x56, 0x59, 0xcb, 0x12, 0x0b,
+	0x5a, 0x76, 0xdb, 0xc4, 0xc3, 0x01, 0x89, 0x15, 0x85, 0x31, 0x08, 0xb0, 0x58, 0x50, 0xae, 0xc6,
+	0xcd, 0xb4, 0x93, 0x5e, 0xa7, 0x8f, 0xcd, 0x57, 0xe8, 0x53, 0xa7, 0xfd, 0x28, 0x7e, 0xea, 0x17,
+	0xe8, 0x74, 0xfa, 0xd0, 0xc7, 0x3e, 0xb9, 0x7d, 0xec, 0xec, 0x05, 0x14, 0x40, 0x00, 0xba, 0xa4,
+	0x99, 0xe9, 0x93, 0x88, 0x3d, 0x67, 0x7f, 0xbf, 0xdf, 0x9e, 0xdd, 0x3d, 0x7b, 0xb0, 0x10, 0x94,
+	0x4e, 0x1c, 0xcb, 0x3b, 0xd6, 0x1b, 0x5d, 0xd7, 0xf1, 0x1c, 0x56, 0x91, 0x4f, 0x65, 0xf1, 0x84,
+	0xe3, 0xf2, 0xa9, 0xb4, 0xd4, 0x76, 0x9c, 0xb6, 0x45, 0x2b, 0x7a, 0xd7, 0xac, 0xe8, 0xb6, 0xed,
+	0x78, 0xba, 0x67, 0x3a, 0x36, 0x93, 0x5e, 0xa5, 0x45, 0x65, 0x15, 0x4f, 0xcd, 0xde, 0x51, 0x85,
+	0x76, 0xba, 0xde, 0xa9, 0x32, 0x16, 0xc3, 0xf0, 0x1d, 0xea, 0x29, 0xf0, 0xd2, 0x00, 0x71, 0xcb,
+	0xe9, 0x74, 0x1c, 0x3b, 0xde, 0x76, 0x4c, 0x75, 0xcb, 0x3b, 0x56, 0x36, 0x12, 0xb6, 0x59, 0x4e,
+	0xdb, 0x6c, 0xe9, 0x56, 0xc3, 0xa0, 0x27, 0x66, 0x8b, 0xc6, 0xf7, 0x0f, 0xd9, 0x16, 0xc3, 0x36,
+	0xdd, 0xd0, 0xbb, 0x1e, 0x75, 0x95, 0xf1, 0x7a, 0xd8, 0xe8, 0x74, 0xa9, 0x7d, 0x64, 0x39, 0xaf,
+	0x1a, 0x77, 0x36, 0x12, 0x1c, 0x3a, 0x2d, 0xb3, 0xd1, 0x31, 0x9b, 0x0d, 0xa3, 0xa9, 0x1c, 0x56,
+	0x63, 0x1c, 0x74, 0x4b, 0x77, 0x3b, 0x67, 0x2e, 0x2b, 0x61, 0x97, 0x53, 0xdd, 0x6e, 0x37, 0x9c,
+	0x6e, 0x20, 0xa4, 0xe4, 0x0f, 0x29, 0x48, 0x6f, 0x0b, 0xd1, 0xbb, 0xae, 0xd3, 0xeb, 0xe2, 0x1c,
+	0x0c, 0x9b, 0x46, 0x31, 0xb5, 0x92, 0xba, 0x3d, 0xb5, 0x39, 0xf6, 0x8f, 0xb7, 0x6f, 0x96, 0x53,
+	0xda, 0xb0, 0x69, 0x60, 0x15, 0x72, 0xe1, 0xe1, 0xb3, 0xe2, 0xf0, 0xca, 0xc8, 0xed, 0xf4, 0xdd,
+	0xb9, 0xb2, 0x9a, 0xc7, 0x3d, 0x69, 0x96, 0x58, 0x9b, 0x53, 0x7f, 0x7b, 0xfb, 0x66, 0x79, 0x94,
+	0x63, 0x69, 0xd3, 0x56, 0xd0, 0xc2, 0x70, 0x03, 0x26, 0x7c, 0x88, 0x11, 0x01, 0x31, 0xed, 0x43,
+	0x44, 0xfb, 0xfa, 0x9e, 0xe4, 0x5b, 0x90, 0x09, 0xa8, 0x64, 0xf8, 0x7f, 0x30, 0x66, 0x7a, 0xb4,
+	0xc3, 0x8a, 0x29, 0x01, 0x31, 0x13, 0x86, 0x10, 0x4e, 0x9a, 0xf4, 0x20, 0x3f, 0x03, 0x7c, 0xc8,
+	0xa3, 0xf2, 0xc8, 0xb4, 0x3c, 0xea, 0x6a, 0x3d, 0x8b, 0x3e, 0xa6, 0xa7, 0xa4, 0x19, 0xd7, 0x8a,
+	0xe3, 0x9c, 0x35, 0x3f, 0x84, 0x93, 0x30, 0xea, 0x9d, 0x76, 0x69, 0x3e, 0x85, 0x19, 0x98, 0x64,
+	0xf4, 0x84, 0xba, 0xa6, 0x77, 0x9a, 0x1f, 0xc6, 0x1c, 0xa4, 0x5d, 0xca, 0x9c, 0x9e, 0xdb, 0xa2,
+	0x0d, 0xd3, 0xc8, 0x8f, 0x70, 0x73, 0x4b, 0xf7, 0x68, 0xdb, 0x71, 0x4f, 0xf3, 0xa3, 0x98, 0x85,
+	0x29, 0x29, 0x98, 0x1b, 0xc7, 0x1e, 0x8c, 0xfd, 0xf3, 0xed, 0x9b, 0xe5, 0x21, 0x72, 0x0c, 0xb9,
+	0x01, 0x2a, 0xfc, 0x14, 0x46, 0x5e, 0xd2, 0x53, 0x11, 0xe6, 0xe9, 0xbb, 0xeb, 0xbe, 0xf8, 0xa8,
+	0xa0, 0x98, 0x26, 0x8d, 0xf7, 0xc4, 0x59, 0x18, 0x3b, 0xd1, 0xad, 0x1e, 0x2d, 0x0e, 0xf3, 0x99,
+	0xd2, 0xe4, 0x03, 0xa9, 0x43, 0x3a, 0xd0, 0x21, 0x69, 0x2e, 0xd7, 0x61, 0xcc, 0xed, 0x59, 0xfd,
+	0x19, 0x5c, 0x48, 0xa0, 0xd7, 0xa4, 0x17, 0xf9, 0x04, 0x32, 0x01, 0x0b, 0xc3, 0x75, 0x98, 0x38,
+	0x92, 0x3f, 0x07, 0x83, 0x1f, 0x04, 0xf0, 0x7d, 0xc8, 0x0b, 0x98, 0xd8, 0x73, 0xda, 0x6d, 0xd3,
+	0x6e, 0x63, 0x05, 0xc6, 0x2c, 0x7a, 0x42, 0x2d, 0x35, 0xee, 0x6b, 0x65, 0xb5, 0x13, 0xf7, 0x9c,
+	0xf6, 0x1e, 0x6f, 0xef, 0xff, 0xd0, 0xa4, 0x1f, 0xae, 0x42, 0xa6, 0xab, 0xb7, 0x5e, 0xea, 0x6d,
+	0xda, 0xb0, 0xf5, 0x8e, 0x3f, 0xd8, 0xb4, 0x6a, 0xdb, 0xd7, 0x3b, 0x94, 0xb8, 0x90, 0xd9, 0x72,
+	0x5c, 0x5a, 0xb5, 0x99, 0xa7, 0xdb, 0x2d, 0x8a, 0x37, 0x21, 0x6d, 0xaa, 0xdf, 0x8d, 0xc1, 0xc1,
+	0x83, 0x6f, 0xa9, 0x1a, 0xb8, 0x01, 0xe3, 0x72, 0xaf, 0x0b, 0xd0, 0xf4, 0xdd, 0x59, 0x7f, 0x10,
+	0xdf, 0x15, 0xad, 0x75, 0x4f, 0xf7, 0x7a, 0x6c, 0x73, 0x8c, 0x2f, 0xc5, 0x21, 0x4d, 0xb9, 0x3e,
+	0x18, 0xfb, 0x37, 0xc7, 0x21, 0x9b, 0x90, 0x0d, 0x72, 0x32, 0x5c, 0x0b, 0xaf, 0xc6, 0x3e, 0x56,
+	0xd0, 0x4b, 0x2d, 0x47, 0x1f, 0xe3, 0xaf, 0xa3, 0x30, 0xfe, 0x4c, 0x78, 0xe1, 0x75, 0x98, 0x38,
+	0xa1, 0x2e, 0x33, 0x1d, 0x3b, 0x2c, 0xd7, 0x6f, 0xc5, 0xfb, 0x30, 0xa9, 0x72, 0x87, 0x3f, 0x67,
+	0xb9, 0x7e, 0xc8, 0x65, 0x7b, 0x70, 0xcf, 0xf4, 0x7d, 0xe3, 0x36, 0xed, 0xc8, 0x7f, 0xbf, 0x69,
+	0x47, 0x2f, 0xbb, 0x69, 0xf1, 0x3b, 0x90, 0x51, 0xdb, 0x81, 0x6f, 0x26, 0x56, 0x1c, 0x13, 0x3d,
+	0x31, 0xdc, 0xf3, 0xe9, 0x69, 0x37, 0xd4, 0x3b, 0x6d, 0xf4, 0x9b, 0x19, 0x6e, 0x41, 0x56, 0x21,
+	0xb4, 0xc5, 0xbe, 0x2f, 0x8e, 0x27, 0x6e, 0xf7, 0x20, 0x86, 0xa2, 0x55, 0xb9, 0x62, 0x0b, 0xb2,
+	0x32, 0x2d, 0xfa, 0xcb, 0x76, 0x22, 0x71, 0xd9, 0x86, 0x40, 0xf4, 0xe0, 0xaa, 0xff, 0x3e, 0x14,
+	0xce, 0x32, 0xb0, 0xee, 0xe9, 0x4d, 0x9d, 0xd1, 0xe2, 0x92, 0x02, 0xe2, 0x96, 0xf2, 0x13, 0xb3,
+	0x29, 0xe5, 0x6c, 0xeb, 0x9e, 0xbe, 0x99, 0xe7, 0x40, 0xe9, 0x40, 0x3e, 0xd0, 0x72, 0xdc, 0x8b,
+	0x3b, 0xa9, 0xde, 0xf8, 0x1c, 0x66, 0x82, 0x39, 0xdb, 0x07, 0x5d, 0x56, 0x53, 0x24, 0x40, 0x85,
+	0xb6, 0x73, 0x61, 0x85, 0x2c, 0xe9, 0xa6, 0x10, 0xfc, 0x25, 0xf6, 0xa7, 0x14, 0xe4, 0xeb, 0xd4,
+	0x3a, 0x7a, 0x4a, 0x99, 0xa7, 0x51, 0xd6, 0x75, 0x6c, 0xc6, 0x33, 0xcf, 0xb8, 0x4b, 0x59, 0xcf,
+	0xf2, 0xd4, 0x26, 0xbc, 0xe5, 0x47, 0x61, 0xd0, 0x33, 0xd8, 0xd0, 0xb3, 0x3c, 0x4d, 0x75, 0x23,
+	0x35, 0x98, 0x0e, 0x5b, 0x30, 0x0d, 0x13, 0xf5, 0xc3, 0xad, 0xad, 0x9d, 0x7a, 0x3d, 0x3f, 0xc4,
+	0x1f, 0x1e, 0x3d, 0xac, 0xee, 0x1d, 0x6a, 0x3b, 0xf9, 0x14, 0x16, 0x20, 0xbb, 0x7f, 0xf0, 0xb4,
+	0x51, 0x3f, 0xac, 0xd5, 0x0e, 0xb4, 0xa7, 0x3b, 0xdb, 0xf9, 0x61, 0xde, 0x74, 0xb8, 0xff, 0x78,
+	0xff, 0xe0, 0xf9, 0x7e, 0x63, 0x47, 0xd3, 0x0e, 0xb4, 0xfc, 0x88, 0x9f, 0x26, 0x0f, 0xa0, 0x70,
+	0x70, 0xf4, 0xb0, 0x4d, 0x6d, 0xaf, 0xde, 0x6b, 0xb2, 0x96, 0x6b, 0x36, 0xa9, 0x8b, 0xcb, 0x00,
+	0xce, 0x91, 0xce, 0x1b, 0xfb, 0xbb, 0x59, 0x9b, 0x52, 0x2d, 0x55, 0x03, 0x17, 0x61, 0x4a, 0x9d,
+	0x70, 0xa6, 0xa1, 0xb2, 0xc3, 0xa4, 0x6c, 0xa8, 0x1a, 0xe4, 0x63, 0x80, 0x27, 0xb4, 0xd3, 0xa4,
+	0x2e, 0x3b, 0x36, 0xbb, 0x1c, 0x49, 0xac, 0x21, 0x99, 0x49, 0x14, 0x92, 0x68, 0xe1, 0x79, 0x04,
+	0xa7, 0x45, 0xae, 0x94, 0x10, 0xc3, 0xa6, 0x41, 0x76, 0x20, 0xf3, 0xc8, 0x72, 0x5e, 0x3d, 0xa1,
+	0x9e, 0xce, 0x67, 0x06, 0xef, 0xc1, 0x78, 0x87, 0x06, 0x92, 0xde, 0x72, 0x39, 0x78, 0x62, 0x3b,
+	0x47, 0xdd, 0x86, 0x30, 0x37, 0x5a, 0x8e, 0x7d, 0x64, 0xb6, 0x35, 0xe5, 0x7c, 0xf7, 0xcf, 0x15,
+	0xc8, 0xca, 0x6d, 0x5e, 0xa7, 0x2e, 0x9f, 0x32, 0x3c, 0x80, 0xe9, 0xc3, 0xae, 0xa1, 0x7b, 0xd4,
+	0x4f, 0x76, 0x98, 0x0b, 0xec, 0x46, 0x9e, 0x27, 0x4b, 0xf3, 0x65, 0x59, 0xe7, 0x94, 0xfd, 0x3a,
+	0xa7, 0xbc, 0xc3, 0xeb, 0x1c, 0x32, 0xfb, 0xe5, 0x5f, 0xfe, 0xfe, 0xd5, 0xf0, 0x34, 0x66, 0x44,
+	0x79, 0x74, 0x72, 0x87, 0x57, 0x24, 0x0c, 0x9f, 0x43, 0x76, 0x97, 0x7a, 0x81, 0x91, 0x26, 0x74,
+	0x2f, 0xf5, 0x37, 0xde, 0x99, 0x2f, 0x29, 0x09, 0xc8, 0x59, 0x44, 0x1f, 0xb2, 0x73, 0x86, 0xf3,
+	0x02, 0xf2, 0x52, 0x69, 0x00, 0x3b, 0x06, 0x23, 0x51, 0xee, 0xb2, 0xc0, 0x5e, 0x20, 0x31, 0xd8,
+	0x0f, 0x52, 0x6b, 0xb8, 0x0d, 0x53, 0xbb, 0xd4, 0x53, 0x39, 0x30, 0x49, 0x73, 0x3f, 0xcd, 0x48,
+	0x3f, 0x92, 0x13, 0x98, 0x53, 0x38, 0xa1, 0x30, 0xb1, 0x07, 0x85, 0x3d, 0x93, 0x79, 0xe1, 0x7c,
+	0x9c, 0x84, 0x36, 0x17, 0x97, 0x98, 0x19, 0xb9, 0xf3, 0xbb, 0x7f, 0xbd, 0x59, 0x9e, 0x50, 0x39,
+	0x5c, 0xfc, 0x46, 0xf9, 0x5b, 0x90, 0xcd, 0x60, 0xc1, 0x1f, 0x80, 0xd9, 0x67, 0xa8, 0x43, 0x6e,
+	0x97, 0x86, 0x58, 0x11, 0xfc, 0xe3, 0xac, 0xba, 0x5d, 0x8a, 0x3d, 0x01, 0xc8, 0x3b, 0x02, 0xaf,
+	0x88, 0xf3, 0x11, 0xbc, 0xca, 0x6b, 0xd3, 0xf8, 0x02, 0x75, 0xc8, 0xf0, 0xb1, 0x3c, 0xf4, 0xf3,
+	0x77, 0xd2, 0x30, 0xf2, 0x03, 0xd9, 0x9f, 0x91, 0x5b, 0x5c, 0x35, 0x9c, 0x1d, 0x13, 0x82, 0x08,
+	0x31, 0xef, 0x13, 0xf5, 0x8f, 0x84, 0xd7, 0x80, 0x9c, 0x62, 0x2f, 0x9c, 0xdd, 0x93, 0x88, 0xe6,
+	0x63, 0xcf, 0x09, 0x46, 0xee, 0x71, 0xba, 0x42, 0xe4, 0x74, 0x11, 0xac, 0xd7, 0x70, 0x21, 0xb0,
+	0x3c, 0x83, 0x66, 0xfc, 0x0c, 0xf2, 0xbb, 0x34, 0xcc, 0x1d, 0x8a, 0x5a, 0xfc, 0xb1, 0x44, 0xde,
+	0x13, 0xb8, 0xef, 0xe0, 0x52, 0x02, 0xae, 0x0c, 0x9e, 0x0b, 0xf3, 0x91, 0x91, 0xd5, 0x1c, 0xd7,
+	0x63, 0xf1, 0x13, 0xa3, 0xfc, 0x84, 0x07, 0xb9, 0xaf, 0x16, 0x40, 0x97, 0x3f, 0x09, 0xb6, 0xf7,
+	0x90, 0x9c, 0xc7, 0x56, 0x11, 0x9e, 0xf8, 0x8b, 0x14, 0xcc, 0x0e, 0x8e, 0x88, 0x23, 0xe2, 0x5c,
+	0x0c, 0x4d, 0xd5, 0x28, 0xcd, 0xc4, 0x34, 0x93, 0x4f, 0x39, 0xf9, 0x38, 0x8c, 0x72, 0x48, 0xc1,
+	0x5d, 0xc6, 0x0f, 0x2e, 0xe6, 0xae, 0xbc, 0xe6, 0x7f, 0x1a, 0x7c, 0xe4, 0xbf, 0x4a, 0xc1, 0xc2,
+	0x8e, 0xad, 0x37, 0x2d, 0x7a, 0x69, 0x21, 0x49, 0x5b, 0xf6, 0x63, 0x21, 0xe0, 0x1e, 0xd9, 0xb8,
+	0x8a, 0x80, 0x0a, 0x15, 0xe4, 0xf8, 0x9b, 0x14, 0x14, 0xb7, 0x4d, 0xf6, 0x8d, 0x08, 0xf9, 0xb6,
+	0x10, 0x72, 0x9f, 0x7c, 0x74, 0x25, 0x21, 0x86, 0x64, 0xc7, 0x9f, 0xc6, 0xac, 0x05, 0x9e, 0xcd,
+	0xc3, 0x6b, 0x01, 0x43, 0x29, 0x5c, 0xd8, 0xc9, 0xa6, 0x5a, 0x09, 0xbc, 0x35, 0x9a, 0x0a, 0x2e,
+	0x5a, 0x15, 0xa2, 0x17, 0x5f, 0x15, 0x4b, 0xfd, 0x14, 0x1f, 0x16, 0xf0, 0x54, 0xc8, 0x5b, 0x8a,
+	0x10, 0x8b, 0x76, 0xd9, 0x27, 0x31, 0x24, 0xeb, 0x42, 0xc2, 0x2d, 0x72, 0x09, 0x09, 0x3c, 0xbd,
+	0xfe, 0x32, 0x05, 0xcb, 0x31, 0x2a, 0x9e, 0xf0, 0x73, 0x49, 0xca, 0x58, 0x0c, 0xc9, 0x10, 0x86,
+	0x27, 0x8e, 0x71, 0x81, 0x8a, 0xb2, 0x50, 0x71, 0x9b, 0xbc, 0x7b, 0xae, 0x0a, 0x79, 0xfa, 0x71,
+	0x19, 0x3f, 0x4f, 0xc1, 0x42, 0x64, 0x2e, 0x04, 0x57, 0x78, 0x32, 0x66, 0xa2, 0x62, 0x18, 0xd9,
+	0xe6, 0x33, 0x30, 0xe9, 0x9f, 0xbc, 0x91, 0xe9, 0xb8, 0x81, 0x97, 0x51, 0x81, 0xbf, 0x4f, 0xc1,
+	0x62, 0xec, 0x72, 0x50, 0xf5, 0x61, 0x50, 0xc6, 0x42, 0x64, 0x6a, 0xa4, 0x13, 0xd9, 0xe7, 0xec,
+	0x59, 0x48, 0x0b, 0x93, 0x2c, 0x46, 0x23, 0x7a, 0xd6, 0xf0, 0xf6, 0x85, 0x73, 0xa3, 0xfa, 0xe2,
+	0x57, 0x29, 0x58, 0x4d, 0x58, 0x24, 0x82, 0x51, 0x4e, 0xd1, 0x6a, 0xbc, 0x9c, 0xcb, 0x2c, 0x97,
+	0x0d, 0x21, 0x69, 0x9d, 0x5c, 0x5a, 0x12, 0x9f, 0xad, 0x17, 0x90, 0xe6, 0x91, 0xba, 0xe8, 0x5c,
+	0xc8, 0x85, 0xeb, 0x6f, 0x46, 0x6e, 0xf0, 0x58, 0x4c, 0xf5, 0xdf, 0x11, 0x04, 0x75, 0x01, 0x73,
+	0x3e, 0xb5, 0x7f, 0x00, 0x18, 0x90, 0x3d, 0x83, 0xaf, 0x1a, 0xc9, 0x04, 0xe9, 0xb3, 0x29, 0x61,
+	0xa4, 0xcc, 0xc1, 0x45, 0x4d, 0x7e, 0xde, 0xd9, 0x2c, 0x39, 0x4c, 0x83, 0xe1, 0x21, 0xe4, 0x35,
+	0xda, 0x72, 0xec, 0x96, 0x69, 0x51, 0x7f, 0x24, 0x41, 0xc0, 0xc4, 0x90, 0x2d, 0x09, 0xcc, 0x79,
+	0x12, 0xc5, 0xe4, 0xb1, 0xd9, 0x11, 0xf5, 0x4a, 0xcc, 0xb1, 0x35, 0xf0, 0x2a, 0xe4, 0xc3, 0xe0,
+	0xec, 0xc0, 0xf0, 0xe5, 0x39, 0xf5, 0x3d, 0xc8, 0x6c, 0xb9, 0x54, 0xf7, 0x94, 0x34, 0x1c, 0xe8,
+	0x1d, 0x41, 0x53, 0x15, 0x1a, 0x19, 0x0c, 0x26, 0x97, 0xf4, 0x1c, 0x32, 0x32, 0xf1, 0xc7, 0xa8,
+	0x4a, 0x1a, 0xe4, 0xbb, 0x02, 0x6f, 0x99, 0x2c, 0xc6, 0xa9, 0xf3, 0x53, 0xf9, 0x0f, 0x21, 0xab,
+	0x32, 0xf9, 0x15, 0x90, 0xd5, 0x39, 0x4d, 0x96, 0x62, 0x91, 0xfd, 0xdc, 0xfc, 0x1c, 0x32, 0x1a,
+	0x6d, 0x3a, 0x8e, 0xf7, 0x8d, 0x69, 0x76, 0x05, 0x1c, 0x07, 0xde, 0xa6, 0x16, 0xf5, 0xbe, 0x46,
+	0x30, 0xd6, 0xe2, 0x81, 0x0d, 0x01, 0x87, 0x3d, 0xc8, 0x6e, 0x3b, 0xaf, 0x6c, 0xcb, 0xd1, 0x8d,
+	0x6a, 0x47, 0x6f, 0xd3, 0xb3, 0xb3, 0x4c, 0x3c, 0xfa, 0xb6, 0xd2, 0x9c, 0x4f, 0x78, 0xd0, 0xa5,
+	0xae, 0xb8, 0xb7, 0xe4, 0xef, 0x52, 0xe4, 0xbe, 0xe0, 0xf8, 0x90, 0xbc, 0x1f, 0xcb, 0x61, 0x72,
+	0x88, 0x86, 0xa1, 0x30, 0x58, 0xe5, 0x35, 0x7f, 0x3d, 0xf9, 0x82, 0x4f, 0xee, 0x97, 0x29, 0x98,
+	0xdf, 0xa5, 0x5e, 0x88, 0x43, 0x5e, 0x4b, 0x24, 0x0b, 0x88, 0x6b, 0x26, 0x0f, 0x84, 0x80, 0x8f,
+	0xf0, 0xee, 0x15, 0x04, 0x54, 0x98, 0x64, 0xea, 0x89, 0x92, 0x2d, 0x84, 0x77, 0x45, 0x76, 0x95,
+	0x87, 0xf0, 0x2a, 0xc3, 0xc7, 0x23, 0x59, 0xa6, 0x86, 0x90, 0xd8, 0xc0, 0x8c, 0xc6, 0xb1, 0x31,
+	0xf2, 0x81, 0xa0, 0xbb, 0x89, 0xef, 0x5d, 0x86, 0x0e, 0x7f, 0x02, 0x33, 0x5b, 0xbc, 0x00, 0xb7,
+	0x2e, 0x39, 0xc2, 0xd8, 0x09, 0x56, 0x23, 0x5c, 0xbb, 0xd2, 0x08, 0x7f, 0x9b, 0x82, 0x99, 0x87,
+	0x2d, 0xcf, 0x3c, 0xd1, 0x3d, 0x2a, 0x58, 0x64, 0x3a, 0xbf, 0x22, 0xf5, 0x96, 0xa0, 0xfe, 0x84,
+	0xfc, 0xff, 0x55, 0xa6, 0x56, 0x36, 0xf7, 0x04, 0x1f, 0x5f, 0x68, 0xbf, 0x4e, 0x41, 0x41, 0xa3,
+	0x27, 0xd4, 0xf5, 0xfe, 0x27, 0x42, 0x5c, 0x41, 0xcd, 0x85, 0x7c, 0x0e, 0xb9, 0xb3, 0xe3, 0x21,
+	0x5a, 0xbb, 0x67, 0x7d, 0x45, 0xb2, 0x68, 0x2f, 0x47, 0x8a, 0xf6, 0x25, 0x2c, 0xc5, 0xd2, 0xcb,
+	0x62, 0xfd, 0x05, 0xcc, 0x04, 0xd0, 0x3b, 0x5b, 0xe2, 0x45, 0x3d, 0xcc, 0x50, 0xe8, 0x33, 0xf8,
+	0x66, 0x72, 0x4b, 0x20, 0xaf, 0xe2, 0xf5, 0x78, 0xe4, 0x8e, 0x7a, 0xe1, 0x67, 0x68, 0xc3, 0x9c,
+	0x8c, 0xdc, 0x20, 0x41, 0x14, 0x34, 0x31, 0x1d, 0xad, 0xc9, 0x2a, 0x93, 0x5c, 0x44, 0xc6, 0x83,
+	0xd5, 0x09, 0x06, 0xeb, 0x72, 0xc5, 0xed, 0x83, 0x73, 0x8b, 0xdb, 0xa4, 0xe8, 0xf5, 0x8b, 0xda,
+	0xd9, 0x30, 0xdf, 0x55, 0xaa, 0xa7, 0x47, 0x97, 0xa8, 0x9e, 0x08, 0xae, 0x24, 0xf2, 0xfb, 0x55,
+	0x93, 0x13, 0x1c, 0xb4, 0xbc, 0x22, 0x4c, 0x2a, 0x21, 0x66, 0xa2, 0xd7, 0x8c, 0x8c, 0x54, 0x38,
+	0xeb, 0x74, 0xf8, 0x5a, 0x32, 0xfe, 0xb4, 0x96, 0x36, 0xd4, 0xc4, 0xe5, 0xca, 0x19, 0xc4, 0x40,
+	0x8c, 0x23, 0x14, 0x64, 0x55, 0xc0, 0x2d, 0xe2, 0xb5, 0x38, 0x38, 0x59, 0x01, 0x30, 0xc8, 0x9f,
+	0x0d, 0x42, 0x45, 0x31, 0x69, 0x14, 0xb3, 0x31, 0x37, 0x9d, 0xea, 0xc2, 0x22, 0x37, 0x70, 0x37,
+	0x2a, 0x6f, 0x5b, 0x70, 0x6e, 0x80, 0x58, 0x45, 0xee, 0x11, 0xe4, 0xeb, 0x9e, 0x4b, 0xf5, 0x4e,
+	0x4d, 0x6f, 0xbd, 0xa4, 0x1e, 0x3b, 0xe8, 0x79, 0x38, 0x1f, 0x9a, 0x2e, 0x69, 0x38, 0xe8, 0x79,
+	0x89, 0xcb, 0x73, 0xe8, 0x76, 0x0a, 0x77, 0x44, 0x71, 0x45, 0xcd, 0x13, 0xaa, 0x80, 0xaa, 0xf6,
+	0x39, 0xd7, 0x2d, 0x51, 0xfc, 0xaa, 0x4d, 0x86, 0x3e, 0x4c, 0xe1, 0x63, 0x98, 0x51, 0x30, 0x5b,
+	0xc7, 0xba, 0xdd, 0xa6, 0x3b, 0x27, 0xd4, 0xf6, 0x92, 0xc3, 0x50, 0x0c, 0x21, 0x05, 0xba, 0x08,
+	0xb0, 0x43, 0x98, 0xee, 0x4f, 0x92, 0xfc, 0x8a, 0x15, 0x7e, 0xb3, 0x88, 0x86, 0x90, 0x90, 0xf8,
+	0x25, 0xaf, 0xa2, 0x25, 0xe7, 0xa9, 0x01, 0x05, 0x59, 0xa9, 0x05, 0xbf, 0xa9, 0xc4, 0xdd, 0x1a,
+	0x97, 0xe2, 0x1a, 0xc9, 0x8a, 0xa0, 0x28, 0x91, 0xfe, 0x84, 0x84, 0x2e, 0xa1, 0xf9, 0x16, 0x96,
+	0xba, 0x83, 0xe8, 0xb1, 0xba, 0x83, 0xa0, 0x11, 0xdd, 0x21, 0x50, 0xa9, 0xdb, 0x80, 0x82, 0xcc,
+	0x44, 0x5f, 0x4f, 0xf7, 0x0d, 0x41, 0x71, 0xbd, 0x74, 0x0e, 0x05, 0x17, 0xff, 0x19, 0x14, 0x64,
+	0xb9, 0x95, 0xa4, 0x3f, 0x69, 0x15, 0xa9, 0x21, 0xac, 0x9d, 0x37, 0x84, 0x86, 0xdc, 0x22, 0xa1,
+	0xef, 0x4e, 0x17, 0x6e, 0x91, 0xa0, 0xb7, 0x7f, 0xf9, 0x88, 0xf1, 0xd1, 0xc7, 0x3d, 0x51, 0xcc,
+	0x8b, 0xa3, 0x8d, 0xc5, 0x17, 0xf3, 0xd2, 0xe6, 0x57, 0x88, 0xb8, 0x98, 0x7c, 0xb0, 0x31, 0xfc,
+	0x01, 0x4c, 0xfa, 0x77, 0xe2, 0x21, 0xb0, 0x62, 0xd2, 0xe5, 0x3a, 0xb9, 0x29, 0x60, 0x57, 0xc8,
+	0x3b, 0xb1, 0xb0, 0x8c, 0x5a, 0x47, 0x0d, 0x8f, 0xa3, 0x3d, 0x13, 0xf5, 0x57, 0xe8, 0xd3, 0xc2,
+	0xe0, 0x6b, 0x73, 0xe4, 0xdb, 0x43, 0x34, 0x07, 0xf1, 0xcd, 0xc3, 0xfd, 0xd4, 0x6b, 0xb1, 0xd9,
+	0xc4, 0xcf, 0x01, 0xfd, 0xa5, 0x97, 0x80, 0x1c, 0xff, 0x01, 0x22, 0x1a, 0x8f, 0x30, 0xb6, 0x88,
+	0x32, 0x32, 0xc8, 0xd6, 0xcd, 0x4e, 0xcf, 0xf2, 0xd7, 0x20, 0x2e, 0xf5, 0x03, 0x11, 0x6c, 0xd6,
+	0xe8, 0x8f, 0x7b, 0x94, 0x79, 0x49, 0x35, 0x45, 0xe4, 0xc2, 0x23, 0x1c, 0x23, 0x85, 0xd4, 0xe0,
+	0x48, 0x7c, 0x41, 0x6e, 0xc1, 0x54, 0xff, 0xc3, 0x01, 0x5e, 0xf3, 0x09, 0x23, 0x9f, 0x14, 0x4a,
+	0xc9, 0x26, 0x32, 0xb4, 0x69, 0xc2, 0x8c, 0xe3, 0xb6, 0x45, 0xb6, 0x69, 0x39, 0xae, 0xa1, 0x5c,
+	0x37, 0x33, 0xf2, 0xfa, 0xb9, 0x26, 0x3e, 0xa3, 0xff, 0xe8, 0xfd, 0xb6, 0xe9, 0x1d, 0xf7, 0x9a,
+	0x5c, 0x75, 0xc5, 0xf7, 0x54, 0xff, 0xce, 0xb0, 0xae, 0xbe, 0xb4, 0xb7, 0x1d, 0xd5, 0xf0, 0xc7,
+	0xe1, 0xf9, 0x03, 0x1f, 0xec, 0x59, 0xf0, 0x2a, 0xbb, 0x36, 0x5c, 0x1b, 0xa9, 0x8d, 0xd6, 0xc6,
+	0x6a, 0xe3, 0xb5, 0x89, 0xda, 0x64, 0x73, 0x5c, 0x74, 0xdc, 0xf8, 0x4f, 0x00, 0x00, 0x00, 0xff,
+	0xff, 0xf2, 0x60, 0x62, 0xf5, 0x25, 0x21, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -2187,8 +2234,8 @@
 	UpdateLogicalDeviceFlowTable(ctx context.Context, in *openflow_13.FlowTableUpdate, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Update meter table for logical device
 	UpdateLogicalDeviceMeterTable(ctx context.Context, in *openflow_13.MeterModUpdate, opts ...grpc.CallOption) (*empty.Empty, error)
-	// Get all meter stats for logical device
-	GetMeterStatsOfLogicalDevice(ctx context.Context, in *common.ID, opts ...grpc.CallOption) (*openflow_13.MeterStatsReply, error)
+	// List all meters of a logical device
+	ListLogicalDeviceMeters(ctx context.Context, in *common.ID, opts ...grpc.CallOption) (*openflow_13.Meters, error)
 	// List all flow groups of a logical device
 	ListLogicalDeviceFlowGroups(ctx context.Context, in *common.ID, opts ...grpc.CallOption) (*openflow_13.FlowGroups, error)
 	// Update group table for device
@@ -2433,9 +2480,9 @@
 	return out, nil
 }
 
-func (c *volthaServiceClient) GetMeterStatsOfLogicalDevice(ctx context.Context, in *common.ID, opts ...grpc.CallOption) (*openflow_13.MeterStatsReply, error) {
-	out := new(openflow_13.MeterStatsReply)
-	err := c.cc.Invoke(ctx, "/voltha.VolthaService/GetMeterStatsOfLogicalDevice", in, out, opts...)
+func (c *volthaServiceClient) ListLogicalDeviceMeters(ctx context.Context, in *common.ID, opts ...grpc.CallOption) (*openflow_13.Meters, error) {
+	out := new(openflow_13.Meters)
+	err := c.cc.Invoke(ctx, "/voltha.VolthaService/ListLogicalDeviceMeters", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2916,8 +2963,8 @@
 	UpdateLogicalDeviceFlowTable(context.Context, *openflow_13.FlowTableUpdate) (*empty.Empty, error)
 	// Update meter table for logical device
 	UpdateLogicalDeviceMeterTable(context.Context, *openflow_13.MeterModUpdate) (*empty.Empty, error)
-	// Get all meter stats for logical device
-	GetMeterStatsOfLogicalDevice(context.Context, *common.ID) (*openflow_13.MeterStatsReply, error)
+	// List all meters of a logical device
+	ListLogicalDeviceMeters(context.Context, *common.ID) (*openflow_13.Meters, error)
 	// List all flow groups of a logical device
 	ListLogicalDeviceFlowGroups(context.Context, *common.ID) (*openflow_13.FlowGroups, error)
 	// Update group table for device
@@ -3302,20 +3349,20 @@
 	return interceptor(ctx, in, info, handler)
 }
 
-func _VolthaService_GetMeterStatsOfLogicalDevice_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+func _VolthaService_ListLogicalDeviceMeters_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(common.ID)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(VolthaServiceServer).GetMeterStatsOfLogicalDevice(ctx, in)
+		return srv.(VolthaServiceServer).ListLogicalDeviceMeters(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/voltha.VolthaService/GetMeterStatsOfLogicalDevice",
+		FullMethod: "/voltha.VolthaService/ListLogicalDeviceMeters",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(VolthaServiceServer).GetMeterStatsOfLogicalDevice(ctx, req.(*common.ID))
+		return srv.(VolthaServiceServer).ListLogicalDeviceMeters(ctx, req.(*common.ID))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -4141,8 +4188,8 @@
 			Handler:    _VolthaService_UpdateLogicalDeviceMeterTable_Handler,
 		},
 		{
-			MethodName: "GetMeterStatsOfLogicalDevice",
-			Handler:    _VolthaService_GetMeterStatsOfLogicalDevice_Handler,
+			MethodName: "ListLogicalDeviceMeters",
+			Handler:    _VolthaService_ListLogicalDeviceMeters_Handler,
 		},
 		{
 			MethodName: "ListLogicalDeviceFlowGroups",