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

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