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

* commit '09b7e00a7e2fad55b53a405902405338b4a831d8':
  Skip aggregation if candidate contact contains too many raw contacts