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

* commit '650887faeb54b6c67c6628ea0b6da5554c58827c':
  Performance tuning for contact aggregator2