This reverts commit bff4d99f. Bug: b/144902035 Change-Id: Iad1a44065715ba406ab7283f14ac2e4219217c33 (cherry picked from commit 00e36f3b1351e2c7248bf0e85af5721ccbd517fb)