This reverts commit 787dedce. Reason for revert: b/230351564 Change-Id: Id32fdad0d4c31992ca739da681ef7273d6dd2705