This reverts commit 4234e6ce. Reason for revert: b/231383951 Change-Id: I41cbc5b4c036109cf45463bddb5b5cc12d11f88e