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

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