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

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