Follow some slice refactors

Test: make
Bug: 68378561
Change-Id: Ifcf2b426f4984d8dda257b55e59d6da7e8d38237
2 files changed