Merge "Re-enable tests that were causing TimeoutExceptions on x86/x86-64."