am 7bfb3f8b: Merge "Revert "Revert "Unfortunately, the test still hits too many run failures."""

* commit '7bfb3f8b1748b5bf7e217a1337176ad488dca66a':
  Revert "Revert "Unfortunately, the test still hits too many run failures.""