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

* commit '9c07fafa999beb107c7a780031b08caaaedd2b5e':
  Clean up/out some comments. DO NOT MERGE.