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