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

* commit '92ab50103a6611ba7f76639fa39645ce6956af85':
  Cleanup: updated comments