Set up for gradual migration.

I tried for a big-bang migration, but merge conflicts killed me.
This should allow us to move in steps (although hopefully also with speed)

Bug: 342622417
Test: Presubmit
Flag: TEST_ONLY
Change-Id: I6b3b4332acb55b94006094aef4ae1b4f69039a90