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

* commit '98d3936f4f71fb0d4c00ccf14415f16470076e24':
  Performance tuning for contact aggregator2