This reverts commit 92ce682a8e.
Reason for revert: <Reason for revert: Dorid monitor: Likely culprit for b/388963512 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.>
Change-Id: I5db1d095aa0960c7445f390b68d7dbe293ecc4b3