am d109b237: am ff91ec35: Tolerate crashes during re-aggregation.

* commit 'd109b23736e4171d23356642bd5dbe28743341da':
  Tolerate crashes during re-aggregation.