Merge commit '542051f19f614c06c4637e3a32ca45e6e2a4add4' * commit '542051f19f614c06c4637e3a32ca45e6e2a4add4': Fixing a concurrency problem by changing the contact aggregation exception API.
Merge commit '542051f19f614c06c4637e3a32ca45e6e2a4add4' * commit '542051f19f614c06c4637e3a32ca45e6e2a4add4': Fixing a concurrency problem by changing the contact aggregation exception API.