This reverts commit 287c8d6f. Bug: 64156587 Bug: 31537595 Change-Id: Ifbab89df78e79fe01881e9d203f46e656985518c