Merge cherrypicks of [20102337, 20112255, 20112112] into tm-qpr1-release.

Change-Id: I72368aa9ccfb755db9bb4bc5a93dfa84380a4c5f
diff --git a/stats/atoms.proto b/stats/atoms.proto
index 38669c3..f284ea6 100644
--- a/stats/atoms.proto
+++ b/stats/atoms.proto
@@ -10323,6 +10323,16 @@
     }
 
     optional HostingTypeId hosting_type_id = 11;
+
+    enum TriggerType {
+        TRIGGER_TYPE_UNKNOWN = 0;
+        TRIGGER_TYPE_ALARM = 1;
+        TRIGGER_TYPE_PUSH_MESSAGE = 2;
+        TRIGGER_TYPE_PUSH_MESSAGE_OVER_QUOTA = 3;
+        TRIGGER_TYPE_JOB = 4;
+    }
+
+    optional TriggerType trigger_type = 12;
 }
 
 /**