Merge changes from topic "presubmit-am-3fb47bd9042c40f2b731af5a9978b6b9" into sc-qpr1-dev

* changes:
  [automerge] Stop crashing the system on hitting the alarm limit 2p: 87fd506129
  Stop crashing the system on hitting the alarm limit