am b049fb09: Default contact aggregator to ContactAggregator2.

* commit 'b049fb09ba37aafc5c12dd93ebf15d219e6dc726':
  Default contact aggregator to ContactAggregator2.