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

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