Tests are still flakey. Bug: 70958370 Bug: 69121056 This reverts commit edbe4cca. Change-Id: Iaf4f2b3b528c92d4057e1449ca96cf7b3182964f