am 56b355d2: am 4a47775a: Fix broken aggregation behavior for pinned contacts and tests

* commit '56b355d275e5e242bf17752e8a6096ee32b400d8':
  Fix broken aggregation behavior for pinned contacts and tests