Merge "Revert "Disabled presubmit for flakey test""