This reverts commit 680d062c77.
Reason for revert: <Potential culprit for b/337796129 - 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: I6fbb7a0587fbb474012e1a97a75c036420500f99