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

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