This reverts commit 61131c10. Reason for revert: b/286941774, b/287013181 Change-Id: I422f709622002ecdf18551d53817d18bc2923a16