Replace deprecated methods

Replace deprecated indexing methods with new signatures to allow for
proper overrides

Bug: 258291421
Test: manual
Change-Id: I45e1b8df5e5eb618bcbf14aa9f48fd7d3f53a780
3 files changed