Rebase: Minor cleanup

Whitespace fixes. Remove unnecessary finals. Consistent comment
formatting.

Change-Id: I284224cd1a7eb4497e46a2b3506f84a386150e59
1 file changed