This reverts commit fc6b5a31. Reason for revert: b/264030929 and b/262948363 Change-Id: Id407dab5bb0e24dc0f1226bd8819af2d8c3e7d54