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

Change-Id: If9628a442ea15f86c15ccc0f49c3f777850ba842