Merge "Partially disable error resilience test" into experimental