Merge "Fix presubmit error 10% flake rate" into main