Merge change 24039 into eclair

* changes:
  Fixing a concurrency problem by changing the contact aggregation exception API.