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

* commit '70b130f5398c43418b6eacba2cc09f71d9febdc4':
  Clean up/out some comments. DO NOT MERGE.