am aa2733d1: Merge "Update the comments to reflect the current status."

* commit 'aa2733d17b87c607fccbd6e6a0f44d2d411ffd77':
  Update the comments to reflect the current status.