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

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