Times out on some run-tests. Bug: 22519499 This reverts commit 3079e28b. Change-Id: I4c612a5af20e4481eb9865f90abd429f4a40ce57