am f60c48e2: Merge "Fix bugs in aggregator2." into mnc-dev

* commit 'f60c48e2125898602214b8abca43b9fdbc942e40':
  Fix bugs in aggregator2.