Merge "Disabled presubmit for flakey test"