Adding more comments and renaming some methods

Bug: 366217822
Test: (no behavioral changes)
Change-Id: Id17f52823d924dcd1246988ef561ddddebbedbe7
6 files changed