Renamed methods for clatification

Test: build
Bug: 239607619
Merged-In: Idf33e6db48e7ccba72b5e389039f68011949938a
Change-Id: Idf33e6db48e7ccba72b5e389039f68011949938a
2 files changed