033f2afe38
This reverts commit ea6ee1c824.
Reason for revert: Seems to increase the severity of the flaky problem
Bug: 204807156
Change-Id: I7b87f2abf45c9da21981f9361e320163bd7834bd