Merge "Disabling the failing piece of a test in presubmit" into main