This reverts commit 90d8bcf8. Reason for revert: Causes frequent flakes in presubmit Bug: 187033888 Change-Id: I5a64f917e78b48f72552d0d8f99caee56f912cd5