Switch to a new aggregator instance.

Aggregator1 is a lucid instance, hard to migrate.

Change-Id: I3aea2f3441de1e961589cc30b7f5d34b25a3dfd6