am 2c919c4e: am becda5cc: Merge "Skip aggregation if candidate contact contains too many raw contacts" into lmp-mr1-dev

* commit '2c919c4e3a4bf1841f7f11855df44f7663bbbd92':
  Skip aggregation if candidate contact contains too many raw contacts