[p4] flaky test fix attempt