Moving these first will make later commits have a cleaner diff. There are no substantive code changes in the moved functions. GitOrigin-RevId: 06e0c5bb02f300942c8fbe80e81484c4d717dbc9
andrew rumble