This reverts commit 447f5b1e. Reason for revert: b/293445283 Change-Id: Iadc6c7ed196be2a65329f86423730ba7f851002c