This reverts commit 4add16c4. Bug: b/130061620 Bug: b/129692959 Change-Id: I07c54f1510d7a5e3aff92cbfffe944e9e8dae9a9