Merge "exclude broken test from presubmit"