Mostly documentation changes, but includes a few refactorings like changing the variable names, reordering functions, reordering statements in logical order, etc. Bug: 173472337 Test: m Change-Id: Iefdc8e463bcda60187b98e8c90661e220e8cdf40