This reverts commit 45bea395. Reason for revert: b/271555837 Change-Id: I0000c7337f71c2ed34b6554797dcfe0cbc204534