Merge "[automerger skipped] Merge "Stop crashing the system on hitting the...

Merge "[automerger skipped] Merge "Stop crashing the system on hitting the alarm limit" into sc-dev am: 8b2f5cec -s ours am: 4792391c -s ours am: b23fac67 -s ours am: d280e9bd -s ours am: f2b66565 -s ours" into tm-qpr-dev-plus-aosp