am fe4233e5: am ebcc7207: Merge "Cleanup: updated comments"

* commit 'fe4233e589bbc035fae49f891b9db7e31bc8b12b':
  Cleanup: updated comments