am 602b8ffb: (-s ours) am 6ad1992b: am 70b130f5: (-s ours) Clean up/out some comments. DO NOT MERGE.

* commit '602b8ffb35fb555fa77081446efa598206e0c3bf':
  Clean up/out some comments. DO NOT MERGE.