This is a non-functional refactor. The old enums will be removed once ag/35323372 is addressed. Bug: 35114358 Test: Ran existing tests (see files touched). Change-Id: I08fd8c7964463b5908ce361e61f8fe811d0ff6f3
acf34d8b62
cd6e0ee19d
b7067e2b6c