Fix deprecated range_x calls.

Test: builds
Change-Id: Id46b4884934c073287136f930ffb37048d78a1d0
2 files changed