This reverts commit 1594aae8. Reason for revert: b/241798893. Change-Id: I07366a6e8c02e1c2efce76048add73acb8677b72