Merge "Revert "Timeout the test run before go/ab timeout to capture test info"" am: 42cd8e7ca4 am: a828dac88e
am: 4dd801f5b3

Change-Id: Idec5e438e07db005d0c1fd92450fb5b8cbbc01c5