Merge "Skip tests that are failing in presubmit"