Merge "Delay global alerts by 1s for high thresholds" am: afffa37248
am: 65fef348de

Change-Id: Iaabb31586e9e747871a526dc7ebb7deeb65d8f83