This reverts commit b3a55af391.
Reason for revert: Potential culprit for b/315354499 - 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: Iab8a208df0704007b9ee29a3673c623eb968ce1b