am 5ff0223b: am 82cb1d2d: am 4f1e51fe: am 8879cc75: am e5bd832d: Fix failing tests due to logic changes in the new aggregator.

* commit '5ff0223bd9b1ee8b32f53c7b42126200bbb0e27a':
  Fix failing tests due to logic changes in the new aggregator.