This reverts commit 8b1d824ad2. Reason for revert: b/332214348 Fix: 332214348 Change-Id: Iac8b9a11fb5b1c2e704eada62869c8c8552b3804
8b1d824ad2