Merge "Make flaky test less flaky" into nyc-dev