This reverts commit 3de05f8d.

Reason for revert: <Reason for revert: Potential culprit for b/322943955  - 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: I8aab36d54502da7bab5fbec49f2ea93b4c7c7a00