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

Change-Id: I25787ee7f5e31f16c15e49b558d5fa8a3e9783cd