am ae6342fd: am 650887fa: Merge "Performance tuning for contact aggregator2" into mnc-dev

* commit 'ae6342fd598813726dae17b8972496af748f0043':
  Performance tuning for contact aggregator2