This reverts commit 720913f5. Reason for revert: b/286121234 Change-Id: Ifac231e7e7eafe7232dd313b4e525cb3f1dde7d4