Merge "Fix expect_timeout_error in IPv6 scenario tests"