Minor: Cleanup and comment update.

Change-Id: I502f838f55a0a7c046b9d5969a8e5fb6af0dbc10
Merge "Minor: Cleanup and comment update."