Merge "Potential fix for flaky tests." into nyc-andromeda-dev