Merge "Disable two tests that require IPv6."