Merge "Timeout the test run before go/ab timeout to capture test info" am: b12d4322fc
am: ebd1e156b2

Change-Id: Ibeb4fb683ec5a1b4a2ac6fab1d15e7c4b8a86cca