This reverts commit 9edbc798bf.
Reason for revert: Likely culprit for b/382590599 - 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: Ib41c13e8ba2e0eaa1ec31486ccf1f61f55793e95