Merge "Disabling a failing test from presubmit" into main