eabf2c39f7
This reverts commit 5dfd939d41.
Reason for revert: b/270395565
Bug: 253338238
Change-Id: I6b2e44c92a67f6675d6947f34167a5f0c1cc6a45