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

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