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

Change-Id: Ie0ba5c1d1a2139606e63fcfe46ec77a89accd8d9