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

* commit 'a016ba5614054e27eada7f4815df7d4bac7ba8d8':
  Re-enable tests that were causing TimeoutExceptions on x86/x86-64.