am ebcc7207: Merge "Cleanup: updated comments"

* commit 'ebcc72070499b2ab2d1dee990d6f52814a56600e':
  Cleanup: updated comments