am fd152c31: Merge "Clean up some comments."

* commit 'fd152c31586a1f5e6763b06f1182ccd72cb86b69':
  Clean up some comments.