Reapply after fixing existing build and test failures. This reverts commit 8e2c5c22be. Bug: 342023558 Test: presubmit Change-Id: I4d36bab7015f401e7580c6287b7f94ffa25c74fc
8e2c5c22be