[automerger skipped] Merge "Delay global alerts by 1s for high thresholds" into pi-dev
am: 688358e870  -s ours

Change-Id: I61187439899450e20f4a1fb7490fff202b60be29