Revert "Revert "Unfortunately, the test still hits too many run failures.""

This reverts commit f8069a217312e486d034cb850e41639580b7385f.

Change-Id: I6359908ef1a2a7927b52d1fd993ef1b5873aa172
1 file changed