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

* commit '23bcd8d298597659622919027c9ea921d5eed513':
  Update comments to reflect what the code actually does