This reverts commit 132ad09bce.
Reason for revert: <Potential culprit for b/377693729 - 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: Ic0cf086e2dc3aad19b1e0965873f9966ad7e6c29