RebaseChange: Minor cleanup

Remove unnecessary finals. Rename some variables for consistency.
Reword some Javadoc and make it consistent. Whitespace and wrapping
cleanup.

Change-Id: Icc0c0b6f0231eae7aed5c676a4cfe2fd26493142
2 files changed