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

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