e48deacbd4
This reverts commit 299576a777.
Reason for revert: b/402037577
Change-Id: I240ffd68ccf3536d80eda1c63395c64c8e48de22