am 825a9a2d: Merge "Update comments to reflect what the code actually does" into jb-mr1-dev

* commit '825a9a2dcd1b3e139dd0677ff46f966fb23f963c':
  Update comments to reflect what the code actually does