Merge "Fix bugs in aggregator2." into mnc-dev