am 670e92f1: am d076a108: Removing contact aggregation scheduler.  The aggregation is no longer running in a separate thread.

Merge commit '670e92f10524f93381d55aa13e81b0716e18c8d0'

* commit '670e92f10524f93381d55aa13e81b0716e18c8d0':
  Removing contact aggregation scheduler.  The aggregation is no longer running in a separate thread.