am e0901bd8: am 24aa3c40: am b9e55995: [Issue 2176079] Fixing the test: ContactAggregatorPerformanceTest

Merge commit 'e0901bd8d0906086c2b7ad9be344292f34b7a4b5'

* commit 'e0901bd8d0906086c2b7ad9be344292f34b7a4b5':