Aggregators should not collect metrics themselves

Change-Id: Ieaf39c5022e54eedf747ea891ec2ad03b8424b3a
Merge "Aggregators should not collect metrics themselves" into production