Merge branch 'carbon_aggregator' into virtualenv_tests_with_aggregator