Merge "[P2P] Fix flaky unit test"