“ https://googleplex-android-review.git.corp.google.com/q/topic:%22validate-with-index%22+(status:open%20OR%20status:merged) fixes validate() so that we're not merging all the time, but it causes flakes when running DeploymentTest#waitForClient: https://b.corp.google.com/issues/141124739#comment31 ”