Merge "Demoting a couple of presubmit blocker tests" into main