diff --git a/protos/voltha_protos/openolt.proto b/protos/voltha_protos/openolt.proto
index bb04eed..e40430d 100644
--- a/protos/voltha_protos/openolt.proto
+++ b/protos/voltha_protos/openolt.proto
@@ -181,6 +181,12 @@
         };
     }
 
+    rpc OnuItuPonAlarmSet(OnuItuPonAlarm) returns (Empty) {
+        option (google.api.http) = {
+          post: "/v1/OnuItuPonAlarmSet"
+          body: "*"
+        };
+    }
 }
 
 message Indication {
@@ -412,6 +418,20 @@
     fixed32 group_id = 14;
 }
 
+message OnuItuPonAlarm {
+    fixed32 pon_ni = 1;
+    fixed32 onu_id = 2;
+    fixed32 alarm_id = 3;
+    fixed32 type = 4;
+    fixed64 rate_thresdhold_rising = 5;
+    fixed64 rate_thresdhold_falling = 6;
+    fixed64 rate_range_lower = 7;
+    fixed64 rate_range_upper = 8;
+    fixed64 threshold_limit = 9;
+    fixed32 active_soak_time = 10;
+    fixed32 clear_soak_time = 11;
+}
+
 message SerialNumber {
     bytes vendor_id = 1;
     bytes vendor_specific = 2;
@@ -523,7 +543,7 @@
 message OnuItuPonStatsIndication{
     fixed32 intf_id = 1;
     fixed32 onu_id = 2;
-    fixed32 rdi_errors = 3;
+    fixed64 rdi_errors = 3;
 }
 
 message OnuProcessingErrorIndication {
@@ -537,10 +557,10 @@
     fixed32 fail_reason = 3;
 }
 
-message OnuRemoteDefectIndication{
+message OnuRemoteDefectIndication {
     fixed32 intf_id = 1;
     fixed32 onu_id = 2;
-    fixed32 rdi_errors = 3;
+    fixed64 rdi_errors = 3;
 }
 
 message OnuLossOfGEMChannelDelineationIndication {