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

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