Merge "Don't use an internal timeout, rely on the test harness one."
am: 3d32bf0b1e

Change-Id: Ib30b33778da6d4d27f3c98ff0c6f22b86ce566c3